[unifi] (2 commits) ...Fix merge conflicts.
Summary of changes:
66ae52b... Update java requires to work with change in java provides i (*)
c709f95... Fix merge conflicts.
(*) This commit already existed in another branch; no separate mail sent