Merge pull request #4093 from seanmonstar/cookies

fix for cookies 0.3.8 not in lockdown.json
Fix for issue #3270: The xhr_delay error message doesn't specify which WSAPI call is timing out
Merge pull request #4094 from khuevu/dev

Fixes #3270: The xhr_delay error message doesn't specify which W...
Fix automation-tests for 797894f "Require a password-level authentication when confirming an email"
Merge pull request #4101 from jrgm/auto-test-fix-for-797894f

Fix automation-tests for 797894f "Require a password-level authentication when confirming an email"
winston out, intel in