Merge topic 'ep-unset-disconnected-vars'

cd379332c3 ExternalProject: Don't rely on *_disconnected vars being unset by caller

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