Merge "Add handling for keystone url w/o version"