PAM: merge upstream limits.conf changes