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

(1 inline comment)

- removed GitIndex usage in MergeCommandTest
- allow to inject DirCache and WorkingTreeIterator
- added missing license headers