A miss from r263140.
Another miss from r263140.
Fix ABI from /usr/local/etc/pkg.conf not being respected.

Regression from r259266.

Sponsored by:	EMC / Isilon Storage Division
MFC after:	1 week