#3510 for master-2.5
Merge pull request #3523 from dotCMS/issue-3510-error-syncing-tab-and-then-change-to-content-2.5

Issue 3510 error syncing tab and then change to content 2.5