Fixed timeout handling in module deployment and wait-for-activation
More test fixes
Use guava instead of apache commons where possible
Use guava instead of apache commons where possible