Added more tests for conditional queries (JAVA-358)
Merge pull request #224 from pingtimeout/2.0

Added more tests for conditional queries (JAVA-358)