Merge changes from topic 'prof-fix' into oc-dev

* changes:
  Gracefully handle bogus profiling info for inline caches.
  Update deopt statements in 638-checker-inline-caches
  Fix profile merges in profman