Merge changes from topic "active-unlock"

* changes:
  Implementing lockUser
  Adding logic for active unlock to grant trust