Merge "Fix barbican service_available check"