jena: update and cleanup

Same of commit 90267d03dff6f5b8f507084f49c4e8d92ac12c2f by TheWhisp

Change-Id: I5be0028f0102ac71a70582127c0db7ef61ef70b9