Merge "Modified dmi plugin stub behavior for EACH new module set tag"