Sweep: Constness of nsw cluster builder
Sweeping !30533 (merged) to 21.9 and adding the fixes needed to compile in master done here: !30780 (merged)
Sweeping !30533 (merged) to 21.9 and adding the fixes needed to compile in master done here: !30780 (merged)