Backport cached deps fix from trunk to make ejabberd build reliably
Backport rabbitmq update to 3.4.2