Fix build
Prevent SSP from erroring out when the yaml is yanked from it.

Patch by brandonwilliams, reviewed by Richard Low for CASSANDRA-7663
Merge branch 'cassandra-1.2' into cassandra-2.0

Conflicts:
	src/java/org/apache/cassandra/locator/SimpleSeedProvider.java
Merge branch 'cassandra-2.0' into cassandra-2.1
Merge branch 'cassandra-2.1' into trunk
Prevent SSP from erroring out when the yaml is yanked from it.

Patch by brandonwilliams, reviewed by Richard Low for CASSANDRA-7663
Merge branch 'cassandra-2.1' into trunk
fix build, remove dead method again
Merge branch 'cassandra-2.1' into trunk
Revert "fix build, remove dead method again"

This reverts commit f7598815059bad05b6c6a4af53c8f5f5c8800a04.
Merge branch 'cassandra-2.1' into trunk