Merge "[ha] Re-enable nginx proxy for Horizon"