Merging fix for MH-8940 into 1.4.x

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

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