Merge change Ibb245ea7 into eclair

* changes:
  Return an empty PluginList instead of null for the deprecated getPluginList() api.