#3864 for master
Merge pull request #3871 from dotCMS/issue-3864-Invalid-Data-Type-errors-on-clean-startup-in-Oracle-master

#3864 for master