Merge proposals dependent on lp://staging/~canonical-platform-qa/ubuntu-system-tests/uci-config-to-ols-config

1. uci-config-to-ols-config
2. Dependent merge proposals