Fixes #6614 : Adding fix for 3.1
Merge pull request #6874 from dotCMS/issue-6614-cms-allows-password-change-without-reathentication-3.1

Fixes #6614 : Adding fix for 3.1