Merge proposals dependent on lp://qastaging/~smoser/livecd-rootfs/cpc_packagin.extra.softlayer-add-grub-legacy-ec2

1. cpc_packagin.extra.softlayer-add-grub-legacy-ec2
2. Dependent merge proposals