Merge proposals dependent on lp://staging/~canonical-platform-qa/ubuntu-ui-toolkit/combobutton-tests

1. combobutton-tests
2. Dependent merge proposals