Bug 397241 - Conflict resolution miscalculates effective scope for children of...

Bug 397241 - Conflict resolution miscalculates effective scope for children of nodes with scope conflict

Replaced conceptually flawed JavaEffectiveScopeCalculator and NearestVersionConflictResolver with new ConflictResolver that resolves scope and version conflicts in interleaved way, the new conflict resolver provides hooks to control details of the scope derivation and conflict resolution strategies