CLOUDIFY-1435 fix map merging. merge the converted value and not the original value