Continued tuningn nslcd.conf upgrade handling [tracker #1647]