Merge "Restart 'nscd' service on changes in nsswitch.conf and nslcd.conf" into release/2019.2.0