Merge "Fix glance standalone when tls-proxy is disabled"