Make keyspace configurable in properties file
Merged keyspace name change