Merge "Cleanup nginx horizon sites by default" into release/2019.2.0