Merge changes Ib69a206f,If57cc175

* changes:
  tombstoned: turn off signal handlers.
  tombstoned: create tombstones with 0640 permissions.