migrate field users.userId to users.id
Merge branch 'migrate-users.userID-to-id'