Stop type hinting against Entity in TermSqlIndex

Change-Id: Iec00a5daa324a9e28bf88053e846ce133a8c04c7
Make fields in EntityRevision private

Change-Id: Idc0ea2927f0719da3112a6b6844b6dd56e728b00
Merge "Stop type hinting against Entity in TermSqlIndex"
Merge "Make fields in EntityRevision private"