Merge branch 'cassandra-3.5' into trunk

CHANGES.txt

@@ -9,6 +9,7 @@ Merged from 3.0:
  * Fix filtering on non-primary key columns for queries without index (CASSANDRA-6377)
  * Fix sstableloader fail when using materialized view (CASSANDRA-11275)
 Merged from 2.2:
+ * Add missing newline at end of bin/cqlsh (CASSANDRA-11325)
  * Unresolved hostname leads to replace being ignored (CASSANDRA-11210)
  * Only log yaml config once, at startup (CASSANDRA-11217)
  * Reference leak with parallel repairs on the same table (CASSANDRA-11215)

bin/cqlsh

@@ -23,4 +23,4 @@ for pyver in 2.7; do
     which python$pyver > /dev/null 2>&1 && exec python$pyver "`python$pyver -c "import os;print(os.path.dirname(os.path.realpath('$0')))"`/cqlsh.py" "$@"
 done
 echo "No appropriate python interpreter found." >&2
-exit 1
+exit 1