Readd UKSM, drop already-included watchdog patch
Update to .2