Merge "Disable stack mprotects when running on valgrind" into lmp-mr1-dev