Merge "Fix acceptance test invocation from Eclipse"