Merge "Add component-override to sysconfig"