This resolves Bug 1950 Make most debugging statements work again Add new debugging statements Fix several annoying build warnings (cherry picked from commit cc5fd88be3)
cc5fd88be3