Merge "Fix bug #2898737 (add unit tests for SyncOperation.toKey())"