PRD-4754 - Fixing MacOS build - undo mac jdk definition
Merge remote-tracking branch 'origin/PRD-4754_branch50' into PRD-5.0-obesity