ninja fix to add null check on CommitLogArchiver startup
Merge branch 'cassandra-2.0' into cassandra-2.1