Merge "Fix 32-bit userspace on 64-bit kernel quota2 compatibility."