Watchdog in Arduino Library - or at least support by bootloader

The more severe issue is, that the bootloader does not de-activate the watchdog upon reset, so that one can end up with endless resets.

the official ATmega328 bootloader (optiboot) deactivates the watchdog on reset.
The official MEGA bootloader does not.
I'm not sure about Leonardo or Due.