Merge changes Ie756b9aa,I38110f3a

* changes:
  [NS A19] Inline updateCapabilities in rematch.
  [NS A18] Reverse listens and request-availables
tree: 7cd6c3cd04b8d13039b19d236add6a4820c5a3db
  1. core/
  2. services/
  3. tests/