Switching back to using ecm.write() instead of ecm.update() because using update() breaks the Core module tests.
Hack to ensure that order by works for String and Number fields.
Merge branch 'two-dot-o' of https://git-wip-us.apache.org/repos/asf/incubator-usergrid into two-dot-o