Merge topic 'smtk-updates'

3d0ff0dc Keep up with SMTK.
800b27c7 Bump CMB to use newer SMTK.

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