Merge "Add KPI2 queries to Gainsight" into release/proposed/2019.2.0