Addition token API changes.

See

https://etherpad.openstack.org/grizzly-keystone-v3api

Change-Id: Ied7552c37c0b9b68a175dd754fb98cd09b9544c1