restore import order and format with spaces
Merge branch 'cassandra-1.2' of github.com:minimarcel/cassandra into cassandra-1.2