Fix NPE if StorageService.getOperationMode() is executed before full startup
patch by cwarrington reviewed by dbrosius for cassandra-6166
Merge branch 'cassandra-2.0' into trunk