Merge "Refactored docker watchdog code"