Merging fix for MH-8905 and MH-8853 into 1.4.x

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