Merge "Prevent conflict of kdt certs for CFG and KDT nodes"