Merge "Update streamitems javadoc" into jb-dev