Work in progress.  Mapping utils need changed.
Merge branch 'two-dot-o-candidate-serialization' of https://git-wip-us.apache.org/repos/asf/incubator-usergrid into two-dot-o-candidate-serialization