SONAR-5580 fix compatibility with Oracle
Merge remote-tracking branch 'remotes/origin/branch-4.5'