trunk-tracking: port r3937 which supports custom url-valued attributes overriding spec-defined ones
Merge branch 'trunk-tracking' of github.com:pagespeed/ngx_pagespeed into trunk-tracking