merge a bunch of FreeBSD TRIM updates (-r 240165 through 252262)