Removing mysterious no-op statement.
Support package imports for CLI plugins

This supports plugins in package, eg. "foo.bar.baz".
Merge branch 'plugin-package' into develop

* plugin-package:
  Support package imports for CLI plugins