CLC-3410 Move UserApi into app/models/user
CLC-3410 Put UserApi in User:: module
CLC-3410 Rename UserApi->Api
Merge pull request #2271 from ctweney/clc-3410-13

CLC-3410 Thirteenth batch of reorg: UserApi
Merge remote-tracking branch 'ets/master' into CLC-3363