Merging fix for MH-9197 into 1.4.x

git-svn-id: http://opencast.jira.com/svn/MH/branches/1.4.x@13640 e6edf6fb-f266-4316-afb4-e53d95876a76
Merging partial fix for MH-9123 into 1.4.x.  Still has issues, but this clears the bug for 1.4 release.

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