[unifi-lts/f31] (3 commits) ...Fix merge conflicts.
Summary of changes:
38e1b73... - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass (*)
1c982ce... Fix Requires for EL 7, fixes RFBZ#5531. (*)
e47a852... Fix merge conflicts. (*)
(*) This commit already existed in another branch; no separate mail sent