Portals: Overwriting some Theme properties on Import even when selecting not to overwrite theme

Importing a Portal and overwriting an existing Portal was not preserving all properties from the Theme page, even if the Import option to "Include Theme" was unchecked.

The following were still being overwritten:

• Logo 1
• Logo 2
• Logo 3
• Logo 4
• Logo and Height
• Background Image
• Inline Resource