Added fixes for Jenkins issues
Revert test fix that pointed out JAVA-313
Merged datastax 2.0
Merge pull request #167 from joaquincasares/jenkins_0421

Added fixes for Jenkins issues