Merge "Fix login redirect for non default (root) context" into stable-2.10