merge with the 2 patches in NSD_2_3_2_REL
merge with the 2 patches in NSD_2_3_2_REL

git-svn-id: e968123f6ae8f722c7dd17742e6e3fc4ee0a0416@1733 a26ef69c-88ff-0310-839f-98b793d9c207

NLnetLabs/NSD,NLnetLabs/NSD,NLnetLabs/NSD,NLnetLabs/NSD