Rename wrongly named EntityRevisionLookup $entityLookup

... and optimize imports.

This addresses the comments I wrote in I5b3b394.

Change-Id: If72fdfe3881c92129dad39957b394314ef1cbbec
Merge "Rename wrongly named EntityRevisionLookup $entityLookup"