Merge branch 'master' into shib-auth

docker-compose.dem.yml

docker-compose.emg.ops.yml

docker-compose.emg.yml

docker-compose.logging.yml

docker-compose.vhr18.ops.yml

docker-compose.vhr18.yml

documentation/operator-guide/configuration.rst

documentation/operator-guide/images/architecture.png

documentation/operator-guide/images/favicon.ico

documentation/operator-guide/intro.rst

documentation/user-guide/images/arcgis_0.jpg

documentation/user-guide/images/arcgis_1.jpg

documentation/user-guide/images/arcgis_2.jpg

documentation/user-guide/images/arcgis_3.jpg

documentation/user-guide/images/arcgis_4.jpg

documentation/user-guide/images/arcgis_5.jpg

documentation/user-guide/images/arcgis_6.jpg

documentation/user-guide/images/arcgis_7.jpg

documentation/user-guide/images/arcgis_8.jpg

documentation/user-guide/images/arcgis_9.jpg