ROO-3505: Upgraded to support Java 8