Merge topic 'remove-MACROS-directory-property'

5f63b3c6b1 Remove MACROS directory property
c1379ef56a find_* commands: ensure correct checks for VALIDATOR option
37fae65a70 Store command type

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