Merge pull request #2141 from jmcclelland/change-test-to-draft-for-civimail