Merge branch 'iotlab_fixes' into geni-v3