Merge "Remove reference to <root-path>." into jb-mr2-dev