This problem only occurs if you enable the Watchdog Safety mode (WDSE bit in UCFG1). When enabled, the watchdog will start after every reset. The ISP code will not feed the watchdog.
Currently the only solution is to not enable the WDSE bit until you are sure you will not need to reprogram the device via ISP.