Fixes to scripts/prepare_instrumentation.sh See merge request !2009
mentioned in issue #1289 (closed)