closes #6584
Merge pull request #6591 from dotCMS/issue-6584-serverId

closes #6584