Ninja-unify 1.1/1.2/2.0 system tests
Ninja-fix 1.2 system tests
Merge branch 'cassandra-1.2' into trunk
don't declare throwing exceptions that aren't thrown
don't declare throwing exceptions that aren't thrown