Merge topic 'ExternalProject-log-options'

7ddc9e353b ExternalProject: option LOG_MERGED_STDOUTERR to combine stdout and stderr
b6f6cac378 ExternalProject: add LOG_DIR option that allows overriding of log location

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