Keep device properties in a single deviceid

Signed-off-by: Tom Haynes <loghyr@primarydata.com>