Merge "Skip resque tests when barbican integration is enabled" into mcp/caracal