Merge proposals dependent on lp:~canonical-platform-qa/ubuntu-system-tests/refactor-command-line

1. refactor-command-line
2. Dependent merge proposals