XWiki-6882 : Improvements on user changing password. Move back new features to passwd.vm instead of ChangePassword.xml