Merge topic 'instrumentation-build-race'

67add75ad7 instrumentation: Load queries for postBuild hook after build is done
b7397f2f29 cmInstrumentation: Simplify test for .json file name suffix
67ed07af23 cmInstrumentation: De-duplicate query directory paths

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