Merge changes from topic "lockoutreset" into rvc-dev

* changes:
  Add missing permission check for addLockoutResetCallback
  Add null pointer check for addLockoutResetCallback