APOLLO-3179 Re-refactored user class for backwards compat
updated uid to to write out both formatted and non formatted versions for es
Merge branch 'master' into APOLLO-3179
Fixed test
Merge branch 'master' into APOLLO-3179
APOLLO-3475 Created team entity