Merge pull request #218 from bhariharan/unstable

Merge branch 'master' into unstable
fixing bug from last commit. querySpec is not available on cursor
cleaning up the last change to MockSmartstore
Merge pull request #219 from akhileshgupta/master

fixing bug from last commit. querySpec is not available on cursor
Merge branch 'master' into unstable