changes for prefix query
Merge branch 'collab' of https://github.com/shyamalan/astyanax into collab

Conflicts:
	astyanax-thrift/src/test/java/com/netflix/astyanax/thrift/ThriftKeyspaceImplTest.java