Related products section on product details uses the wrong property for displayin the related product
Fix a few issues with the admin forgot password flow
Update pom.xml

Remove unnecessary pom element
Remove unnecessary configuration
Fix formatting
Replace tabs with spaces
Merge remote-tracking branch 'origin/upstream-develop' into develop

Conflicts:
	admin/build.xml
	admin/pom.xml
	admin/src/main/webapp/WEB-INF/applicationContext-admin-security.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/META-INF/persistence.xml
	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/webapp/WEB-INF/applicationContext.xml
	site/src/main/webapp/WEB-INF/log4j.xml
	site/src/main/webapp/WEB-INF/templates/catalog/product.html
	site/src/main/webapp/WEB-INF/templates/layout/partials/header.html
	site/src/main/webapp/WEB-INF/web.xml