Log message: Merge packages from the buildlink2 branch back into the main trunk that have been converted to USE_BUILDLINK2.