[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

[Steve Langasek]

Needed to redo the gbp import-orig here in order to get the pristine-tar data, so cherry-picking from you rather than merging, sorry.
-- 
https://code.launchpad.net/~daniel-thewatkins/ubuntu/+source/gce-compute-image-packages/+git/gce-compute-image-packages/+merge/307369
Your team Ubuntu Development Team is requested to review the proposed merge of ~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.