Fix errors introduced by switch away from get by UUID.
Merge branch 'two-dot-o' of https://github.com/usergrid/usergrid into Conversion_to_faster_2.2.0

# By Dave Johnson
# Via Dave Johnson
* 'two-dot-o' of https://github.com/usergrid/usergrid:
  Fix errors introduced by switch away from get by UUID.
Added back old code so to pass more test cases