Merge "Use pathPrefix filter instead of path for /btopp content" into jb-mr1-dev