get changes from commit 3eb7dbb304c4ba2829353e5f12a5c84fc682cf9e (2.10 branch) and resolve conflicts.

Fixed issue with registration and password reset not working

Possibly caused by spring security implementation.