Merging fix for MH-9541 into 1.4.x

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

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

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