Merge "prepare for testresults.opnfv.org's watchdog"