Fix for test case failure. Issue #463
Merge branch 'trunk' of github.com:impetus-opensource/Kundera into trunk

Conflicts:
	src/kundera-cassandra/cassandra-core/src/test/java/com/impetus/kundera/client/cassandra/persistence/CassandraCli.java