Fixup for CASSANDRA-6914: null handling, ...

patch by slebresne; reviewed by thobbs for CASSANDRA-7155