Some tiny remnants from merge conflicts, now cleaned up and compiles as usual.
Make python interface compile again: add API change to initDUT function call
(hubid)