Convert some more code away from IPAddress specific (stopped working after a previous change).
Simplify some of the JSON handling.
Authored by: dannybackx 2018-09-11
Parent: [r88]
Child: [r90]