HTH: Allow packaging of data (like an initial sync) into downloadable json (part 2)

Part 2: add missing device data, fix missing device line, make import more robust.