‘Consummate public servant’ McNeill dies