Fix external submodules where merge commits where created when merging the work on CMake Multi-Config build.
