Merge "Fix getting pillar values for ES health check"