Merge branch '2.5' of ssh://git.eclipse.org/gitroot/eclipselink/eclipselink.runtime into 2.5