Merge proposals dependent on lp://qastaging/~philroche/ubuntu-on-ec2/ec2-publishing-scripts-kernel-panic-revert

1. ec2-publishing-scripts-kernel-panic-revert
2. Dependent merge proposals