Merging with the openshift-diy-nginx-uwsgi openshift container