Updated minimum java requirements to 1.7
Removed jdk6 only build profiles and folders
Updated new modules merged from 3.x to declare version 4.0-M1-SNAPSHOT