Make corresponding changes to Excel and Xls report renderers to use the generic POI ss interfaces rather than the hssf one's specifically.  Change how we are loading templates per recommendations in upgrade guide, to support both xls and xslx templates.