Bug 844426 - limit to ES5 syntax; get rid of generators, fix tests

Take related sub-repo fixes.

Rename some iterators that were dangerously colliding with outer iterators.

Fix unit tests that were broken by a change to the activesync sub-repo that had
not yet been pulled into GELAM, but which was as part of my porting of Vivien's
changes.