Embedded image corruption fix

When using xhmtl11 and embedded images the base64 data would sometime get
corrupted when patterns like '++++' would be turned to '+'

Change-Id: I701ff72d5e0616947af2d4f06fea3406506f98a4