Patch Set 3:

This change needs to be rebased on top of 4th path set of I92a9a778d5c97f200781e970ea37a8f7c1ae191d and then together with jgit change I441db34f226be36548c61cef77958995971498de this NPE shouldn't appear.