Merging revs 14073, 14084, and 14105 into 1.4.x from trunk as part of MH-8884.

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