Merging fix for MH-9385 into 1.4.x

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

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

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

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

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

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