* stable-2.14: Fix canonical URL detection with URL encoded parts Change-Id: I309d81c1d5e219875ff0fa97ac32caef0e3ae58e