General fixes
Merge pull request #3994 from owncloud/fix_oracle_setup

General setup fixes for Oracle