Replaces --endpoint to --os-endpoint
and
--token to --os-token in keystone client calls

Closes-Bug: #1254634

Change-Id: I22b6af351dd3a371443f486c01785c706eff8397
Merge branch 'master' of https://github.com/openstack/trove-integration