Merge branch 'add-2fa-status-to-admin-api' into 'master'

Add 2FA status to user admin API

This MR adds the `two_factor_enabled` field to the admin's API to indicate whether a given user has enabled 2FA.

See merge request !881