Merge branch 'master' into shib-auth

client/html/user-guide/_static/plus.png

client/html/user-guide/_static/pygments.css

client/html/user-guide/_static/searchtools.js

client/html/user-guide/_static/underscore-1.3.1.js

client/html/user-guide/_static/underscore.js

client/html/user-guide/downloading.html

client/html/user-guide/intro.html

client/html/user-guide/sample-requests.html

client/html/user-guide/viewing.html

client/html/user-guide/web-client.html

config/dem_sftp_users.conf

config/emg_preprocessor-config.yml

config/emg_sftp_users.conf

config/kibana.yml

config/vhr18_sftp_users.conf

core/Dockerfile

core/entrypoint.sh

core/registrar.py

docker-compose.base.ops.yml

docker-compose.dem.ops.yml