Merge topic 'update-kwsys'

05e3abafa5 Merge branch 'upstream-KWSys' into update-kwsys
82fd685043 KWSys 2020-08-05 (185dd56e)

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