Re-enable illumos/pkg and mercurial