Ignore units on FontSize in shapeMarshall
Handle None from shape.getFontSize()
Merge pull request #3259 from will-moore/text_ROI_units_bug

Ignore units on FontSize in shapeMarshall