MFC r263180:

  Fix ABI from /usr/local/etc/pkg.conf not being respected.
MFC r263180:

  Fix ABI from /usr/local/etc/pkg.conf not being respected.
Revert r263625 to fix commit msg for blame
MFC r263181:

  Fix ASSUME_ALWAYS_YES not being parsed properly from config after UCL conversion.