Keystone changes for RHOS-HA related to [CFNR-158]

Signed-off-by: salmank <salmank@plumgrid.com>