Added support for different files for grid and oracle
Working with Oracle 12c
Merge remote-tracking branch 'origin/oracle12'