Fix for checkout —theirs or checkout —ours not working if theirs or ours was a deleted node.
Fixed some issues with handling deleted features while resolving merge conflicts.
Propagate conflicts on end transaction.
Fixed incorrect exceptions in unit tests.
added py4j entry point
Merge remote-tracking branch 'origin/pr/555'
Merge remote-tracking branch 'origin/pr/542'
Merge remote-tracking branch 'origin/pr/540'
Revert "Fixed incorrect exceptions in unit tests."

This reverts commit 69352838800b6be8cceffb4b7139e79c53aa9856.