from_addr in emails is class specific
Merge branch 'feature/kluo/bulk-email' of https://github.com/edx/edx-platform into feature/kluo/bulk-email