ENG-5690: Temporary fix for junit deadlocks related to the shutdown
hooks.
Fix (hopefully) broken mac builds on older clang (<3.4)
Merge branch 'master' into ENG-5856
For ENG-5856, check OS reliably before checking total memory