Merge branch 'hotfix/sync-bugzilla-exceptions'
Fix uid in the previous hotfix
Merge branch 'hotfix/fix-uid-in-bz-sync' into develop