Fixes for plugin {} type resolution after recent changes to PluginManager.

+review REVIEW-5214