Removed intermediate entity load.  This is not required any longer.

USERGRID-1282
Merge branch 'USERGRID-1282' of github.com:apigee/usergrid-stack into USERGRID-1282