Backport - Merge devGuide - 03-portlet - fix lists, fixes for portlet-info, and some typos