Merge branch 'master' into escape-regex-specials-in-path

Resolve conflicts in Tests/CTestTestMemcheck/CMakeLists.txt by combining
changes from both sides.
Merge topic 'escape-regex-specials-in-path' into next

e4e0921 Merge branch 'master' into escape-regex-specials-in-path
Tests/VariableUsage: Finish cleanup from parent commit
Merge topic 'revert-extra-space' into next

64bf6e9 Tests/VariableUsage: Finish cleanup from parent commit
Merge topic 'escape-regex-specials-in-path'

e4e0921 Merge branch 'master' into escape-regex-specials-in-path
c9b75dc Fix test failures caused by regexp-sensitive characters in the build paths
Merge branch 'master' into next