Merge "libxt_quota - remove spurious divergence from upstream"