Use auth_uri/identity_uri and remove usage of admin_token in trove.conf

Change-Id: I8284aeff7cc6f01a1889fb724e8fc155445888b9
Merge "Use auth_uri/identity_uri and remove usage of admin_token in trove.conf"