When moving the files within the merge commit, git for some reason does not recognize the files as moved, so we move them before actually doing the merge.
Change-Id: I5a8ba6b027734c8ff38a7f2a5dc51a30a0fc17a8
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@theqtcompany.com>
