Lockport Alderman Patrick McDonald dies after battle with cancer