Change: Move smtpserver setting for cf_execd to def

mailto and mailfrom are already in def. It makes sense to keep the smtpserver
with them. This is intended to make policy framework upgrades slightly easier.

Pick from master