Merge pull request #1271 from arjantijms/4.0.0-M3

Use EE4J 2.0.1 parent