Rename mailer method to avoid naming conflict in Rails 3
Merge remote-tracking branch 'openaustralia_github/backport_rails_3_mailer_fix' into develop