PRD-4754 - Fixing MacOS build
PRD-4754 - Fixing MacOS build
PRD-4754 - Fixing MacOS build - undo mac jdk definition
Merge pull request #251 from tmorgner/PRD-4754_branch50

PRD-4754 - Fixing macos build (PRD-5 maintenance branch version)