Merge changes from topic "revert-injectors" into oc-mr1-dev

* changes:
  Revert "Add API to allow apps more control over instantiation"
  Revert "Add plugin to swap out recents"

diff --cc api/current.txt
Simple merge

diff --cc api/system-current.txt
Simple merge

diff --cc api/test-current.txt
Simple merge