Merge changes from topic "framework-conn-stub-cp"

* changes:
  Reference framework-connectivity stubs explicitly
  Merge framework-connectivity impl and stub targets