Merge "Allow separate registration of DMIDataPlugin and DmiModelPugin"