Merge "fix for BUG-709 - mixed up flow cookie and connection cookie"