Contact Form: enhance unparsed contact-fields.

- Make sure everything is escaped with an `esc_html` call on the return value.
- Leave the value part out of shortcode atts that do not have one
- Leave the "trailing" closing tag when there is no content