Fixes adtnd script paths
Merge branch 'adtnd-fix' into next