Merge remote-tracking branch 'origin/upstream-develop' into develop

Conflicts:
	admin/build.xml
	admin/pom.xml
	admin/src/main/webapp/WEB-INF/log4j.xml
	admin/src/main/webapp/WEB-INF/web.xml
	combined/build.xml
	core/pom.xml
	core/src/main/resources/sql/load_admin_security.sql
	pom.xml
	site/build.xml
	site/pom.xml
	site/src/main/resources/runtime-properties/development.properties
	site/src/main/resources/runtime-properties/local.properties
	site/src/main/resources/schema.xml
	site/src/main/resources/solrconfig.xml
	site/src/main/webapp/WEB-INF/applicationContext.xml
	site/src/main/webapp/WEB-INF/log4j.xml
	site/src/main/webapp/WEB-INF/templates/account/manageCustomerAddresses.html
	site/src/main/webapp/WEB-INF/templates/checkout/partials/shippingInfoForm.html
	site/src/main/webapp/WEB-INF/templates/layout/partials/header.html
	site/src/main/webapp/WEB-INF/web.xml
Merge remote-tracking branch 'upstream-DemoSite/admin3' into admin3

Conflicts:
	admin/src/main/resources/com/mycompany/gwt/mycompanyAdmin.gwt.xml
	admin/src/main/webapp/WEB-INF/applicationContext-admin.xml
	site/build.xml
Merge remote-tracking branch 'upstream-DemoSite/admin3' into admin3

Conflicts:
	site/src/main/resources/runtime-properties/development.properties
Merge remote-tracking branch 'origin/upstream-I18n-develop' into admin3
advanced-search artifact changed from org to com.
Conflicts:
	admin/build.xml
	admin/pom.xml
	admin/src/main/resources/com/mycompany/gwt/mycompanyAdmin.gwt.xml
	admin/src/main/webapp/WEB-INF/applicationContext-admin.xml
	admin/src/main/webapp/WEB-INF/web.xml
	combined/build.xml
	combined/pom.xml
	core/pom.xml
	core/src/main/resources/sql/load_admin_security.sql
	pom.xml
	site/build.xml
	site/pom.xml
	site/src/main/webapp/WEB-INF/log4j.xml
	site/src/main/webapp/WEB-INF/web.xml