Merge remote-tracking branch 'mrvisser/issue-694' into issue-694
fix checkstyle issue
(Issue 696) WIP
(Issue 696) WIP
(Issue 696) WIP: Alter cassandra.js methods for CQL3