returned back the order of tokens in iterate.hive.test -- looks like this may be significant.
Merge remote branch 'origin/trunk-gd' into fb-GEN-TESTS-SPLIT-trunk-gd