Merge changes from topic "s-resetlockout-update" into sc-dev

* changes:
  Add resetLockoutRequiresChallenge property
  Update lockout-related properties for easier understandability