export fld max execution time to an hour (refs #3466)
Merge pull request #630 from Eric-Brison/3.2-A3466

export fld max execution time to an hour (refs #3466)
Merge pull request #629 from cbonnissent/3.2A3505

Rename zone to passwordModifier (refs #3505)
Use html instead of text for error return (refs #3505)