Fix a transaction state bug for property remove+add combo

Resolve an issue where discrete remove+add operations on an existing property
is not properly translated to a change operation, but rather is translated to
an add operation.
Merge pull request #3000 from jakewins/2.1-property-remove-add

Fix a transaction state bug for property remove+add combo