Merge "Fix keystone protocol for horizon in virtual-mcp-pike-{ssl|ssl-barbican}"