Added missing columns to users CSV export
Merge branch 'master' into hotfix-admin-users-export
Merge branch 'hotfix-admin-users-export'