USERGRID-2099:

 o modified JsonUtils to consider the 'name' property as special
   without converting it to a UUID if the value of 'name' is a UUID
 o also added a test that demonstrates the correct operation of
   of this issue after the fix
merge in from master
USERGRID-2099: fix to make existing data return without CCE
Merge pull request #209 from apigee/USERGRID-2099

Usergrid 2099