Avoid ugly JSON writeback for dict-objects fields when field is null
Merge carma-sync and postgresql-sync-map json branches to master
fix null serialization, should help with #1092
just in case
Merge branch 'i914-dipq'
Merge branch 'master' into production