UUID Token provider in keystone.conf

Token provider needs to be set to uuid.Provider when the token format is
UUID. PKI is the default.

Change-Id: I967289524a50f650cdf2476d5067d263dbf55b03
Fixes: bug #1201639
Merge "UUID Token provider in keystone.conf"
Merge remote-tracking branch 'm_src_repo/citrix-fixes' into build-temp