Merge pull request #307 from tmorgner/master

PRD-4606 - Progress marker fix for legacy mode.
Merge pull request #308 from tmorgner/master

PRD-4889 - Performance monitoring infrastructure added
Seems we still have not enabled JDK 1.7 language features.