Merge "Fixes yum update on undercloud"