Merge "Fix Plugin execution not covered in Eclipse for config subsystem"