Fixed pending message in queue issue - property name was changed in new version
Merge remote-tracking branch 'origin/master'
Import stm clean up and sys out clean up
Mail job impl for testing