Merging PR #5552
Merge branch 'pceric-master'

* pceric-master:
  Removed 'driver_options' from oci8 connection class parameters
  Add driver options to the Oci8 Db adapter
Fixed const typo
Merge pull request #5582
Merge pull request #5582 in develop