Bug#854010: Merge request for this bug

[Dan Streetman]

Please see this MR with the latest patches for this bug report:

https://code.launchpad.net/~ddstreet/ubuntu-dev-tools/+git/ubuntu-dev-tools/+merge/322863