Forgotten java 1.6 to java 1.7 change in multiple poms.
Merge remote-tracking branch 'origin/java1.7' into core_refactor2