Merge proposals dependent on lp://staging/~canonical-platform-qa/ubuntu-system-tests/config-handle-special-characters

1. config-handle-special-characters
2. Dependent merge proposals