Make required changes for Oracle compatability on new oracle branch, new branch fixes rebase issues