defect 4035 fix merge error in previous checkin to handle multiple servicenode entries