Patch Set 1: I would prefer that you didn't submit this

(8 inline comments)

This change isn't in shape for review
- it depends on an abandoned change, to fix that rebase this change onto origin/master
- it contains an unresolved conflict, hence it doesn't compile
- the commit message is redundant and doesn't have a Change-Id footer
- it lacks unit tests

Please follow the guidelines given in the contributor guide [1]

[1] http://wiki.eclipse.org/EGit/Contributor_Guide#Contributing_Patches