hax
Revert "hax"

This reverts commit 5f4b44316dae09942be3c883118dc0d6b82b9fba.
Fix typo in computing build-time plugin dependencies
Allow circular deps when initializing catalog if already built.

Previously, we could only run any commands at all on this branch because
of a typo that was causing us to ignore all plugin dependencies when we
computed build-time dependencies (fixed in f94fd9d). This commit puts us
back in the state we thought we were in (things mostly work if you have
package builds cached from a different meteor branch).
WIP: compute build ids and add to versions.

Utterly untested.
Merge plugin/slice watch sets before including in build id
serverPackageData can be null
Set officialBuild flags on 'publish' and 'publish-for-arch'
Fix checks before computing build id
Fix WatchSet.merge to actually merge files.

Not sure why this was commented out?
Remove outdated comment
Store and read build-time deps in unipackage buildinfo.json
Use build-time deps in `checkUpToDate`
Remove a couple completed XXXs
Remove `packageDirectoryForBuildInfo`.

We used to keep the `packageDirectoryForBuildInfo` of every package that
a package directly depends on in its buildinfo.json; if direct
dependencies change, then we might need to rebuild because they could
have registered or unregistered a plugin. Now we just keep the package
name and version (including build for our local packages) of our direct
dependencies.
Remove another XXX
Fix incorrect PackageLoader constructor arguments