Merge branch 'r/20.x' into develop #86

Job	Run time
Detect branch and appropriate server	21s
Deploy admin-interface.opencast.org	7s
	28s

Provide feedback