AW-59 : Migrate java 1.6 -> java 1.7