Merge "Add BaseTemplateAfterPortlet hook to add html after portlets"