Merge "PackageManager plumbing to support non-staged APEX installs" into sc-dev