Attempt a little more advanced merging.

If the basic merge cases don't work then we look a deeper in to the
conflict.  Here, we look for insertions before or after a part that is
common with the base.  Even if the other side changes or deletes the
common part we will still insert these parts.

Change-Id: I253c715384e70a26904354001ecb511e82b38f2b
Merge commit 'refs/changes/32/32/1'; commit 'refs/changes/26/26/2' into experimental