Merge "Fix login servlets when canonicalWebUrl is not set" into stable-2.6