Merge "Adjust to pkg name change for ConfigAssignmentNode"