Committing fix for MH-9470 into 1.3.x.

git-svn-id: https://opencast.jira.com/svn/MH/branches/1.3.x@14212 e6edf6fb-f266-4316-afb4-e53d95876a76
Merging workaround for MH-9045 into 1.4.x

git-svn-id: https://opencast.jira.com/svn/MH/branches/1.3.x@14282 e6edf6fb-f266-4316-afb4-e53d95876a76