Save compelte conf dir rather than specific files
Merge branch 'keystone-workarounds' into dt-test