Merge branch 'master' of github.com:gnurag/openshift-origin-cartridge-httpd-proxy