Fix Swift config dir variable name

Change SWIFT_CONFIG_DIR to SWIFT_CONF_DIR to be consistent with all other projects.

Change-Id: I52b7d08f038c28a16caa669d7d1aa5248fbe7789
Merge branch 'run-service' into dt-test
Merge branch 'swift-conf' into dt-test
Merge branch 'clean-me' into dt-test