Fix race in FileCacheService RemovalListener
patch by Sankalp Kohli; reviewed by jbellis for CASSANDRA-7278
Merge branch 'cassandra-2.0' into cassandra-2.1