ninja fix for missing buffer offsets in CASSANDRA-5884
Merge branch 'cassandra-2.0' into trunk