merge from master
Merge remote-tracking branch 'upstream/master' into B-66281_feeds_catalog
B-66281: fix trailing slash not matching feedscatalog app