Merging fix for MH-9488 into 1.4.x

git-svn-id: http://opencast.jira.com/svn/MH/branches/1.4.x@13970 e6edf6fb-f266-4316-afb4-e53d95876a76
Merging fix for MH-9489 and MH-9483 since they appear to depend on eachother.

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