updates for rjava
Merge branch 'master' into develop
rserve start up