Fix JSON mapper to use same setup as we do in Collections module serializer.
Merge branch 'two-dot-o' of https://github.com/apache/incubator-usergrid into two-dot-o