Ninja fix debian rules to handle versions with -N package convention
Merge branch 'cassandra-2.1' into trunk