fixes #13103, correct token generation.
Merge branch '2.0-dev' of github.com:NETivism/netiCRM into 2.0-dev