ROO-3106: Spring Roo doesn't support new Java 7 language features - cleanup