[unifi/f28] (6 commits) ...Fix conditional for java add modules option.