[unifi/f29] (4 commits) ...Fix conditional for java add modules option.