Merging fix for MH-9404 into 1.4.x

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

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

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

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