Improvements to tests only in Rest and QueryIndex modules.
Code to ensure query limit is satisfied despite stale entries, but commented out because of insufficient testing.
Merge branch 'two-dot-o' of https://git-wip-us.apache.org/repos/asf/incubator-usergrid into two-dot-o