Merge "Fix login redirect loop when auth.type = HTTP" into stable-2.6