Merging fix for MH-8614 into 1.4.x.

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

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