Optionally disable including salutation in active_address_fields

I think it's a common enough requirement to justify the extra line of
code. Requested in #1156.

Fixes #1156.