Track added size correctly

Patch by marcuse; reviewed by jbellis for CASSANDRA-7239
Merge branch 'cassandra-2.1' into trunk
Fix more stress bugs (ninja)
Merge branch 'cassandra-2.1' into trunk
Do not exit nodetool repair when receiving JMX NOTIF_LOST

patch by yukim; reviewed by krummas for CASSANDRA-7909
Merge branch 'cassandra-2.0' into cassandra-2.1

Conflicts:
	CHANGES.txt
Merge branch 'cassandra-2.1' into trunk
Warn on startup if swap file enabled on Windows

patch by Josh McKenzie; reviewed by Philip Thompson for CASSANDRA-7316
Merge branch 'cassandra-2.1' into trunk
SSL does not work in cassandra-cli.

patch by jasobrown, reviewed by beobal for CASSANDRA-7899
Merge branch 'cassandra-2.0' into cassandra-2.1

Conflicts:
	CHANGES.txt
Merge branch 'cassandra-2.1' into trunk

Conflicts:
	src/java/org/apache/cassandra/thrift/SSLTransportFactory.java
Add support for aggregation functions

patch by blerer; reviewed by slebresne for CASSANDRA-4914
Fix CONTAINS filtering on sets

We were comparing the index expression value with the cell values
instead of the cell names, which is where set values are stored.

Patch by Tyler Hobbs; reviewed by Benjamin Lerer for CASSANDRA-8033
Merge branch 'cassandra-2.1' into trunk
Fix Thrift slice deletions, incomplete cell names in updates

Patch by Tyler Hobbs; reviewed by Sylvain Lebresne for CASSANDRA-7990
Merge branch 'cassandra-2.1' into trunk