Merge "Add a stack trace to the Smoke Test emails (if available)"