Merge "Fix old references to portalapps service"