Allow the use of checkout --theirs and --ours on deleted features.

During conflict resolution, the system uses geogit checkout --ours or --theirs to pick which feature to resolve the conflict with.  This was not working when the conflict was caused by a modification and a delete.  Unit tests were also added to cover these cases.

The PR also fixes a ConcurrentModificationException in RemoveOp.