Use the additional keystone-manage parameters to setup the identity endpoint in the service catalog rather than manually fetching a token for this. Change-Id: I6f5be1df205dee8f3251b4eb413e00ae64f00f07