Merge branch 'bug-900506-update-products-page' into demo-3-branch

Conflicts:
	bedrock/mozorg/templates/mozorg/products.html