Merge pull request #216 from bhariharan/unstable

Merge branch 'master' into unstable
fixing getMore resultset for cache.find with smartsql
Merge pull request #217 from akhileshgupta/master

fixing getMore resultset for cache.find with smartsql
Merge branch 'master' into unstable