Merge branch 'master' of https://git.eclipse.org/gitroot/eclipselink/examples

Conflicts:
	jpa/employee.dynamic/pom.xml
	jpa/employee/employee.web-js/pom.xml
	jpa/polyglot/polyglot.client/pom.xml