Make ThriftServer more easlly extensible

patch by Sam Tunnicliffe; reviewed by Aleksey Yeschenko for
CASSANDRA-6058
Merge branch 'cassandra-2.0' into trunk