Merge "Fix trailing slash in ENTERPRISE_CONTENT_FILTER_URI"