Merge branch 'hotfix/1.21.14' into stable
fix detecting pkgng on freebsd
Merge pull request #2066 from wayneeseguin/bugfix/freebsd_pkgng_detection_2066

FreeBSD pkg.conf check does not account for manually added packages.
1.21.15
Merge branch 'master' into hotfix/1.21.15
Merge branch 'hotfix/1.21.15'