Merge "Update configure_uwsgi run in baremetal/container"