Merging fix for MH-9461 into 1.4.x

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

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

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

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

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