Refactoring grande, for cluster tests; trying to get to 2x2 tests with AHC/JDK-HTTP, BDB-JE/LevelDB permutations