MT#9281 fix ba1edcf828eb don't add default if cluster_sets is already there

Change-Id: I43c7ef1e95d7f04cb038fb97df5d6e7133389335
(cherry picked from commit 1c588ab5d41381a2aa16284a752b28f832e1ba6a)