Merge "Enable barbican-keystone-listener for virtual-mcp11-aio model"