option to use UUID keystone tokens instead of PKI

allows devs to use short UUID tokens instead of long PKI tokens
fixes bug #1213250

Change-Id: Ic6869231f494ec79b0e432845ec7ca0b670fe059
Merge "option to use UUID keystone tokens instead of PKI"