Merge "Fix barbican integration on compute nodes"