Issue 578

Fixed issue with invalidating CSK passwords.
Merge pull request #583 from blackberry/next-578

Issue 578