Merge pull request #2068 from kamailio/xavp_serialize_fields