Update version for 1.2.5 release
fix repair test after CASSANDRA-5523
fsync leveled manifest to avoid it getting corrupt

Patch by marcuse, reviewed by jbellis and carlyeks for CASSANDRA-5535
Merge branch 'cassandra-1.1' into cassandra-1.2

Conflicts:
	CHANGES.txt
	src/java/org/apache/cassandra/db/compaction/LeveledManifest.java
Merge branch 'cassandra-1.2' into trunk

Conflicts:
	build.xml
	src/java/org/apache/cassandra/db/compaction/LeveledManifest.java
	test/unit/org/apache/cassandra/service/AntiEntropyServiceTestAbstract.java
fix bad merge