JENA-1785: Comment up and cleanup after fix
4 files changed