b7b537b36a
Also removes the user/catalog listing to work with keystoneless undercloud. Change-Id: Ie61f7b3baf24cca7c1121e91298b075fde40b0f3