Merge changes I6c800641,Ia0a05c93 into pi-dev

* changes:
  ART: Fix core image detection
  Fix running some run-tests with -Xjitthreshold:0