I ported the quota changes to 2.5.18.  The first one is just a minor
change to Makefile and Config.in to not build quota.c when not needed.