Merge "Remove Keystone client variables that are not used anywhere"