Merge change I1f30f3f1 into eclair

* changes:
  Fix #2201615: getCallingPackage returns calling process instead of calling package