Plugin Store changes

Changes to support the Plugin Store better and a few other non-functional changes. No need to upgrade from the previous release.