Merge change 1664

* changes:
  Added PluginManager to handle getting all the plugin directories from PackageManager.