synced to Perforce Change 543446
Merge remote-tracking branch 'origin/fromP4'

Conflicts:
	gosu-core-api/pom.xml
	gosu-core-api/src/main/bnd/bnd.bnd
	gosu-core/pom.xml
	gosu-core/src/main/bnd/bnd.bnd
	gosu-interactive/pom.xml
	gosu-itcase-utils/pom.xml
	gosu-parent/pom.xml
	gosu-process/pom.xml
	gosu-servlet/pom.xml
	gosu-test-api/pom.xml
	gosu/pom.xml
	gosu/src/test/java/gw/lang/build/JarContentITCase.java
	pom.xml
fix a pom that wasn't merged properly
fixing dependencies