Merge "Remove redundant parameter to modifyRoute" into jb-mr2-dev