Merge "Enable SECURE_PROXY_SSL_HEADER option for horizon"