Update usage of tenant to project_id and user to user_id when handling context fields. This drops deprecation warnings. Change-Id: I8001be34bcc25678ed99b6b6717ad170ae6d2d77