
The 'mergeable' property of a change exists only if it is specifically asked for, otherwise it is undefined. This was causing some false positives when checking for merge conflicts. Also removes some dead code. Bug: Issue 6819 Change-Id: Ib42bac8067afacb09d20cd122f9d9f41425207e0