Merge carma-sync and postgresql-sync-map json branches to master