PIP2-11 Correct the javax.crypto conditional setting
PIP2-11 Comment out Oracle driver and related configs
Merge pull request #2857 from ctweney/pip2-11

PIP2-11 Correct the javax.crypto conditional setting