SNAPDEPLOY-95: Display comma-separated address lines better when 2nd and 3rd lines can be empty. Fix broken tests related to new default system config values.