added temp ability to enable PKI tokens for keystone