Merge branch 'master' into 'master'

Dockerfile

conf/etc/apache2/sites-available/000-default.conf

conf/etc/entrypoint

conf/etc/shibboleth-ds/LICENSE.txt

conf/etc/shibboleth-ds/blank.gif

conf/etc/shibboleth-ds/idpselect.css

conf/etc/shibboleth-ds/idpselect.js

conf/etc/shibboleth-ds/idpselect_config.js

conf/etc/shibboleth-ds/index.html

conf/etc/shibboleth-ds/nonminimised/idpselect.js

conf/etc/shibboleth-ds/nonminimised/idpselect_config.js

conf/etc/shibboleth-ds/nonminimised/idpselect_languages.js

conf/etc/shibboleth-ds/nonminimised/json2.js

conf/etc/shibboleth-ds/nonminimised/typeahead.js

conf/etc/shibboleth/keygen.sh

conf/faas-registry.cnf

docker-compose.yml