am db610220: Merge "Hide PlusinsEnabled/PluginsPath methods" into jb-mr2-dev

* commit 'db610220c480fd571851738dd8f01aa96894165c':
  Hide PlusinsEnabled/PluginsPath methods