[Merge] ~ddstreet/ubuntu-dev-tools/+git/ubuntu-dev-tools:megamerge_request into ubuntu-dev-tools:master

[Dan Streetman]

Would you prefer if I opened MR for each commit?  I tried to split the commits in the most logical way, but I'm not sure if each commit is completely standalone.  But it probably would make reviewing easier.
-- 
https://code.launchpad.net/~ddstreet/ubuntu-dev-tools/+git/ubuntu-dev-tools/+merge/375292
Your team Ubuntu Development Team is subscribed to branch ubuntu-dev-tools:master.