Sync two users from upstream infrastructure hotfix for bugzilla exceptio...

Sync up with infrastructure hotfixes for bugzilla exceptions.