Merge change I2cdb052a into eclair

* changes:
  Import testrunner changes from puppetmaster to keep them in sync.