Merging fix for MH-9138 into 1.4.x.

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

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

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