Merge remote-tracking branch 'origin/master' into 252-handle-the-abort_prepare-workflow-event-in-cta

Conflicts:
	continuousintegration/docker/ctafrontend/cc7/opt/run/bin/ctaeos-mgm.sh