cleanup
Improve error message when yaml contains invalid properties
patch by Mikhail Stepura; reviewed by jbellis for CASSANDRA-5958
Merge branch 'cassandra-2.0' into trunk