Beautification, unused imports
Add flag for using watchdog
Merge pull request #1305 from atsareg/fix-v6r7

Putting aside the use of watchdog in the Subprocess