Merge "Add smoke decorator for barbican tests." into mcp/stein