bug #3776 [cookies] Login without auth on second server
Merge branch 'QA_3_5'
Fix merge conflicts