MH-9365 rc6 merge


git-svn-id: http://opencast.jira.com/svn/MH/branches/MH-8100@13798 e6edf6fb-f266-4316-afb4-e53d95876a76