Patch Set 1: Looks good to me, approved; IP review completed

egit change I621645a6 adapts egit to this incompatible change
so these two changes should be submitted together to prevent breaking the build