Don't require the sysctl file to exist when deleting it
Merge branch 'cassandra-1.2' into cassandra-2.0