Merge proposals dependent on lp://qastaging/~komputes/ubuntu-manual-tests/komputes-manual-tests

1. komputes-manual-tests
2. Dependent merge proposals