These changes are required to match what is in reference policy along 
with new changes in nscd.