Merge "Add better SQL exception handling to the Sync framework (see bug #3202693)"