[unifi-lts/el8] (2 commits) ...Fix merge conflicts.