Reverting accidental commit of my local DB settings as part of the resolution for MH-9202.

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

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

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

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