Patch Set 1: I would prefer that you didn't submit this; Unclean IP, do not check in

(5 inline comments)

- removed merge commit http://egit.eclipse.org/r/#change,1651 by cherry-picking http://egit.eclipse.org/r/#change,1652 onto retargeted http://egit.eclipse.org/r/#change,1670
- cleaned up commit message to follow project conventions
- I am not sure if this change goes in the right direction