Merging fix for MH-9361 into 1.4.x

git-svn-id: http://opencast.jira.com/svn/MH/branches/1.4.x@14115 e6edf6fb-f266-4316-afb4-e53d95876a76
Merging fix for MH-9429 into 1.4.x because it blocks MH-9430 from being applied.  Fix does not currently appear to work.

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