Merging fix for MH-9446 into 1.4.x

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

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

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

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