SCRUM-1541 - Working on Nameserver json serialisation
Merge remote-tracking branch 'origin/andyrdap' into andyrdap