Updates mapper to not create key/value entries in the extra_data diction...

...ary for null or empty string values.
trailing commas