Merge pull request #17012 from SmithSamuelM/sam_dev1

Fixed some tests. Refresh of masters in minion join behavior resets puid so consistent behavior