Patch Set 7:

* rebased
* fixed issue with comparing current HEAD in egit against v0.10.1 (because we use here only two-way-compare all changes in this comparison are marked as conflicting, this is fixed in change 3891, where three-way-compare is used)