Merge branch 'release-2.0.0-RC1-jpa' into release-2.0.0-RC1-jdo