Merge topic 'msvc-link-merge-fix'

a9f992434d VS: Remove the /MERGE flag from FlagTables

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6205