Merge pull request #17058 from SmithSamuelM/sam_dev1

Better support (but not complete) for Mult-Masters on Salt Raet