[Merge] ~tobhe/ubuntu-dev-tools:master into ubuntu-dev-tools:master

[Tobias Heider]

This MR documents the new options introduced in https://code.launchpad.net/~paride/ubuntu-dev-tools/+git/ubuntu-dev-tools/+merge/409346
-- 
https://code.launchpad.net/~tobhe/ubuntu-dev-tools/+git/ubuntu-dev-tools/+merge/416458
Your team Ubuntu Development Team is requested to review the proposed merge of ~tobhe/ubuntu-dev-tools:master into ubuntu-dev-tools:master.