Fixed lint comment
Fixed Typo
Reset puid when refreshing master for minion joiner
Merge remote-tracking branch 'upstream/develop' into sam_dev1
Merge pull request #17012 from SmithSamuelM/sam_dev1

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