[bug 994538] Added Cancel button in Change password area

This will allow user to come back to edit page if they don't want to change the password.