ROASTER-7: JDK 1.6 compatibility changes