PRD-4978: Revert changes to make PRD compile and run under JDK 1.6
Merge pull request #327 from tmorgner/master

PRD-4978: Revert changes to make PRD compile and run under JDK 1.6