Merge "Disable APPLY_HARD_QUOTAS in favor of "resgid"." into pi-dev