Minor: improve java doc
Merge remote-tracking branch 'nuvolabase/develop' into develop
Fix junit annotation