[Merge] ~daniel-thewatkins/ubuntu/+source/gce-compute-image-packages/+git/gce-compute-image-packages:master into ~ubuntu-dev/ubuntu/+source/gce-compute-image-packages/+git/gce-compute-image-packages:master

[Philip Roche]

Review: Approve

I have not tested but LGTM. 
-- 
https://code.launchpad.net/~daniel-thewatkins/ubuntu/+source/gce-compute-image-packages/+git/gce-compute-image-packages/+merge/316554
Your team Ubuntu Development Team is subscribed to branch ~ubuntu-dev/ubuntu/+source/gce-compute-image-packages/+git/gce-compute-image-packages:master.