Merge branch 'master' of github.com:ESGF/esgf-docker into openshift