Merge "Add watchdog for Heka services"