Updating internal tool references
Fixing config issues and adding locationID2 support
Merge branch 'refs/heads/3.x' into whaleshark.org

Conflicts:
	src/main/resources/bundles/commonConfiguration.properties
	src/main/resources/bundles/newIndividualNumbers.properties
	src/main/resources/bundles/submitActionClass.properties
	src/main/webapp/software/GridClient.zip
	src/main/webapp/software/Interconnect.zip