Merge change I75630000 into eclair

* changes:
  Fixing tests that exercise SecurityManager plus stack inspection.