Merge "fixes in CassDAOImpl.java"