Merge "Skip tests when service barbican is enabled" into mcp/xenial/rocky