Added SMTP settings to CSDEF and CSCFG
Added ConfirmEmailAddresses setting to CSDEF
D'oh! Mistyped the setting name in CSDEF
Fix for #869 - Change "returnURL" for some pages.
Merge branch 'Bug-869' into staging