Setting required merge fields as required on the settings form. Addresses #1134964 and forward port of #949932.