Remote type column mapping, and single quotes around discriminator value...

Relates to HHH-8929