Merge pull request #628 from cbonnissent/3.2I3478

Correct global order (refs #3478)
Rename zone to passwordModifier (refs #3505)