Updated poms to 2.4.0-SNAPSHOT
Merge branch '2.4'