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/pom.xml
	admin/src/main/webapp/WEB-INF/applicationContext-admin-security.xml
	pom.xml
	site/src/main/webapp/WEB-INF/templates/catalog/product.html