make forms utility and misc cleanup
Merge pull request #4074 from dimagi/opm-es

make forms utility and misc cleanup