Merging fix for MH-9373 into 1.4.x

git-svn-id: http://opencast.jira.com/svn/MH/branches/1.4.x@13701 e6edf6fb-f266-4316-afb4-e53d95876a76
Merging fix for MH-9374 into 1.4.x

git-svn-id: http://opencast.jira.com/svn/MH/branches/1.4.x@13702 e6edf6fb-f266-4316-afb4-e53d95876a76
Merging fix for MH-8854 into 1.4.x

git-svn-id: http://opencast.jira.com/svn/MH/branches/1.4.x@13704 e6edf6fb-f266-4316-afb4-e53d95876a76
Reversing out accidental merge of config changes as part of MH-8854.

git-svn-id: http://opencast.jira.com/svn/MH/branches/1.4.x@13705 e6edf6fb-f266-4316-afb4-e53d95876a76