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