Fixed broken build with RequiredExecutionEnvironment: JavaSE-1.7 (for now, may still have to stick to Java 6 for prod - LATER)