r/m PBS test since it keeps heisenfailing (PBS is already gone for 2.0; see #5455)
Merge branch 'cassandra-1.2' into trunk