Merge branch 'master' of ssh://git.eclipse.org/gitroot/eclipselink/javax.persistence