Merge "Don't try to run os-net-config from yum_update.sh" into stable/ocata