Merge pull request #28 from belliottsmith/17013-trunk

CASSANDRA-17013: CEP-10 Simulator Improvements