Merge proposals dependent on lp://qastaging/~smoser/ec2-init/ec2-init.devel

lp://qastaging/~smoser/ec2-init/ec2-init.devel has no merge proposals.