BZ-12550: Fixing missing portfolioService.getPortfolio issue.
Merge branch 'PM2Way' into integration