Guys, please review: https://issues.apache.org/jira/browse/WHIRR-158 https://issues.apache.org/jira/browse/WHIRR-233 I've been able run all integration tests on aws-ec2 for current trunk + 158 + 233. I'm looking forward to close WHIRR-264 as no longer a problem and rebuild the artefacts for 0.4.0 -- Andrei Savu