APF-1341: Upgrade to UrlRewriteFilter 4