Merge "Move generateChallenge/revokeChallenge to ISession"