[FORGE-1836] Refactor towards JDK 1.7 enhancements
Merge pull request #461 from danielsoro/FORGE-1836

[FORGE-1836] Refactor towards JDK 1.7 enhancements