Merge "Fix getting pillar values for ES health check" into release/proposed/2019.2.0