Merge proposals dependent on lp://qastaging/~dpigott/lava-master-image-scripts/add-license-click-through-support

1. add-license-click-through-support
2. Dependent merge proposals