* Upstream all locally carried patches
* Upstream all further patches needed to get 1.6.x to build on FreeBSD
* Remove fake ncursesw temporary workaround
* Add ONNX option to conditionally enable new auto-enabled option
* Rename systemd option knobs as needed by 1.6.x