[Bug 1358430] Adjustments for glibc split NSS packages