Fix AbstractCellName.makeCellName for collections
add StorageService.stopDaemon
patch by Lyuben Todorov; reviewed by Tyler Hobbs for CASSANDRA-4268
Merge branch 'cassandra-2.0' into trunk