[FORGE-1836] Roaster Refactor towards JDK 1.7 enhancements

Roaster Refactor towards JDK 1.7 enhancements