as adjusted by Todd for GPS.
paul
Merge remote-tracking branch 'origin/master'
rolling back away from a background mail sender (temporary CURRIKI-6114).
paul