Pull ThrottleTest changes from cassandra