Patch Set 6: Looks good to me, but someone else must approve; IP review completed

I worked in two comments from Shawn. But I had to seperate out the work on NameConflictTreeWalk into an own change.

Still I am not so happy with the tests. I have put some questions in ReadTreeTest and some assertions are now commented out because they will break DirCacheCheckout.