Merge "Add missing headers to config, netconf subsystems"