Merge changes from topic 'lss-update'

* changes:
  Add challenge to IGateKeeperService
  Wire up GateKeeper to LockSettingsService