Refactoring ItemDisambiguation logic.

Removes all uses of EntityContent from ItemDisambiguation
and refactors the logic.

This also adds a load of test cases.

Change-Id: I340adafdf678796cd5862b85858205a76b0a8017
Merge "Refactoring ItemDisambiguation logic."