Added fixes for Jenkins issues

Added a few fixes to take care of race conditions on 2.0 and 2.0+1.2 tests, exception for a 2.0+1.2 querybuilder test, and corrected the import ordering via my new IntelliJ orderings.