Removed redundant keystone token usage

Change-Id: Ifdd3601100dc73a2e8c1fec9f7afc0c8c5b591f1
Merge "Removed redundant keystone token usage"