give the master a unique id
Merge pull request #15881 from thatch45/master_id

Give the master a unique id