Better diagnostics for failing cookie test on openjdk6
merge with master