fix error on change password
fix fdp duplicate issue
Merge branch 'master' of https://github.com/EdgeComputing/cats