Merge "tombstoned: turn on java trace support + unit tests."