finish cleaning out keystone_data.sh

Change-Id: If2e9c37f97d281d7e9463c4e0be3dfd9ee5ee044
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