Merging fixes for MH-9351 and MH-9044 into 1.4.x

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