Committing fixes for MH-9309 and MH-8776 into trunk for Eduardo.

git-svn-id: http://opencast.jira.com/svn/MH/trunk@13618 e6edf6fb-f266-4316-afb4-e53d95876a76