Fix heap size calculation on Windows
patch by Josh McKenzie; reviewed by Philip Thompson for CASSANDRA-7352
Merge branch 'cassandra-2.1' into trunk