Merging fix for MH-9305 into 1.4.x

git-svn-id: http://opencast.jira.com/svn/MH/branches/1.4.x@13500 e6edf6fb-f266-4316-afb4-e53d95876a76
Reversing changes made by MH-9309 from 1.4.x.  These changes broke upload.

git-svn-id: http://opencast.jira.com/svn/MH/branches/1.4.x@13502 e6edf6fb-f266-4316-afb4-e53d95876a76
Merging fix for MH-9341 into 1.4.x

git-svn-id: http://opencast.jira.com/svn/MH/branches/1.4.x@13503 e6edf6fb-f266-4316-afb4-e53d95876a76
Merging fix for MH-9335 into 1.4.x

git-svn-id: http://opencast.jira.com/svn/MH/branches/1.4.x@13504 e6edf6fb-f266-4316-afb4-e53d95876a76
Merging fix for MH-9339 into 1.4.x

git-svn-id: http://opencast.jira.com/svn/MH/branches/1.4.x@13505 e6edf6fb-f266-4316-afb4-e53d95876a76
Merging fix for MH-9340 into 1.4.x

git-svn-id: http://opencast.jira.com/svn/MH/branches/1.4.x@13507 e6edf6fb-f266-4316-afb4-e53d95876a76
Merging fix for MH-9346 into 1.4.x

git-svn-id: http://opencast.jira.com/svn/MH/branches/1.4.x@13513 e6edf6fb-f266-4316-afb4-e53d95876a76
Merging fix for MH-9347 into 1.4.x

git-svn-id: http://opencast.jira.com/svn/MH/branches/1.4.x@13514 e6edf6fb-f266-4316-afb4-e53d95876a76
Merging fix for MH-9348 into 1.4.x

git-svn-id: http://opencast.jira.com/svn/MH/branches/1.4.x@13515 e6edf6fb-f266-4316-afb4-e53d95876a76
Merging fix for MH-8796 into 1.4.x.

git-svn-id: http://opencast.jira.com/svn/MH/branches/1.4.x@13522 e6edf6fb-f266-4316-afb4-e53d95876a76
Merging fix for MH-9349 into 1.4.x

git-svn-id: http://opencast.jira.com/svn/MH/branches/1.4.x@13523 e6edf6fb-f266-4316-afb4-e53d95876a76
Merging new fix for MH-8796 into 1.4.x

git-svn-id: http://opencast.jira.com/svn/MH/branches/1.4.x@13531 e6edf6fb-f266-4316-afb4-e53d95876a76
Merging fix for MH-9298 into 1.4.x

git-svn-id: http://opencast.jira.com/svn/MH/branches/1.4.x@13532 e6edf6fb-f266-4316-afb4-e53d95876a76
Merging fix for MH-9317 into 1.4.x.

git-svn-id: http://opencast.jira.com/svn/MH/branches/1.4.x@13534 e6edf6fb-f266-4316-afb4-e53d95876a76
Merging fix for MH-9354 into 1.4.x

git-svn-id: http://opencast.jira.com/svn/MH/branches/1.4.x@13545 e6edf6fb-f266-4316-afb4-e53d95876a76
Merging fix for MH-9307 into 1.4.x

git-svn-id: http://opencast.jira.com/svn/MH/branches/1.4.x@13546 e6edf6fb-f266-4316-afb4-e53d95876a76
Merging fix for MH-8905 and MH-8853 into 1.4.x

git-svn-id: http://opencast.jira.com/svn/MH/branches/1.4.x@13547 e6edf6fb-f266-4316-afb4-e53d95876a76
Merging fix for MH-9355 directly into 1.4.x

git-svn-id: http://opencast.jira.com/svn/MH/branches/1.4.x@13550 e6edf6fb-f266-4316-afb4-e53d95876a76
Merging fix for MH-9153 into 1.4.x

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