Import Mode: Fix for add + branch in the same change.
Convert Mode: Allow add + branch, but copy +x and other properties to new object.
- Added test case 117
Fix for Import mode; when a file is renamed (case only) and contains an edit.
The branch part of the rename is now downgraded to an EDIT.
- Added testcase 116