increase timeout for slow machines and provide more descriptive error message
Fix compile error with Eclipse 4.3.1.

The method dimEquals(String, String) is ambiguous for the type DimFilters
Merge branch 'master' of https://github.com/metamx/druid