Merging fix for MH-7526 into 1.4.x

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

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