removed cherry pick for https://review.openstack.org/#/c/125354/ as it has merged upstream.
removed cherry pick for https://review.openstack.org/#/c/125354/
as it has merged upstream.

rdo-management/instack-undercloud,eprasad/instack-undercloud,dpkshetty/instack-undercloud,agroup/instack-undercloud,rdo-management/instack-undercloud,agroup/instack-undercloud,dmsimard/instack-undercloud,dpkshetty/instack-undercloud,dmsimard/instack-undercloud,eprasad/instack-undercloud,bcrochet/instack-undercloud,bcrochet/instack-undercloud