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

[Dan Streetman]

I divided this into separate commits, but not too many commits, as best I could.  I can open separate merge requests to further reduce each merge size, but it's a lot of code no matter how it's divided up.
-- 
https://code.launchpad.net/~ddstreet/ubuntu-dev-tools/+git/ubuntu-dev-tools/+merge/375292
Your team Ubuntu Development Team is requested to review the proposed merge of ~ddstreet/ubuntu-dev-tools/+git/ubuntu-dev-tools:megamerge_request into ubuntu-dev-tools:master.