Correct import
Handle directories in the config directory when we try to clone config
Filter the 'user' keyword from the config for cloud.

When the tests aren't run as root, it goes around replacing/injecting a user config option for the user the tests are run as.  This upsets cloud, so we'll filter it out like default_include and similar get filtered.
Fixing some missing PEP8ness
Merge pull request #10031 from kaithar/feature/test-fixes

Feature/test fixes