Go back to Java 6 code compliance for lodmill-rd