Re-jiggle the paths so extension.json can be auto-generated
Fixed network device performance graphs
Merge branch 'release/v2.8'