Committing 'fix' for MH-9520.  Waiting on feedback before merging.

git-svn-id: http://opencast.jira.com/svn/MH/trunk@14124 e6edf6fb-f266-4316-afb4-e53d95876a76
Committing fix for MH-9517 into trunk.

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