Refinement on master conf grains, should always overwrite, not just during refresh (otherwise certain refreshes might fail)
Merge pull request #14450 from panoptix-za/fix_feature_add_grains_support_to_master_and_roster

Refinement on salt-ssh master conf grains, should always overwrite