Merge "Change portal-rest-url to internal cluster port"