Merge "Fix two multi-user bugs in package upgrade." into nyc-dev