Merge branch 'deprecate-opts' into dt-test
Merge branch 'set-conf-dir-1' into dt-test
Merge branch 'set-conf-dir-2' into dt-test
Merge branch 'test-service-functions' into dt-test
Merge branch 'move-create-accounts' into dt-test