Merge "Fix errors in tls-proxy startup for cinder"