Updated tests, test multi ordering with complex candidate results.

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