Merge topic 'vs-sln'

4747b64fff VS: Restore include_external_msproject type detection

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