Marjorie Carroll, former Waterloo mayor, has died