Merging fix for MH-9482 into 1.4.x

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

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

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