Merge "Restart 'nscd' service on changes in nsswitch.conf and nslcd.conf"