Bigdata & NoSQL fixes
Merge branch 'master' of https://github.com/open-infinity/cmt
Bigdata & NoSQL fixes