Backport cached deps fix from trunk to make ejabberd build reliably
Update joyent
Update joyent