Inaccurate conflict detection for moves in non-containment features

Change-Id: Iea6f9979d2e4b07b9b34ce594fe653eaaca40594
2 files changed