Merge pull request #13161 from calavera/plugin_discovery

Proposal: Volume refactor and external volume plugins