Revert "fix test"

This reverts commit 85c390ab6315f097d469745c5a93ec8a9a571b36.
Merge branch 'barceloneta'
Revert "Revert "fix test""

This reverts commit b3eb6650d5b4a3849ff35124ee149d5610654fef.
Update CHANGES. We will cut a new 2.1.x branch for Plone 5.
Preparing release 2.1.0
Back to development: 2.1.1
Fix i18n of 'This field is required' for the login field in pwreset form.
mail password form update to match other site setups