Merge branch 'master' into develop

# Conflicts:
#	CHANGELOG.md
#	LICENSES.md
#	core/core/src/docker/test-CI/prepare_sp.sh
#	core/core/test/serverspec/spec/haproxy_tls_termination/haproxy_tls_termination_spec.rb
#	core/core/test/serverspec/spec/master/master_spec.rb
#	core/data/azure/infrastructure/epiphany-qa-basic/basic-data.yaml
#	core/data/azure/infrastructure/epiphany-qa-template/data.yaml.j2
#	core/data/azure/infrastructure/epiphany-single-machine/data.yaml
#	core/data/metal/epiphany-single-machine/data.yaml