backport oracle related changes, mostly comments, but also setup related...

... fixes

@DeepDiver1975 @icewind1991 @MTGap