Minor synchronization code changes:

- Add a test case for two conflicting adds of a single-valued attribute (no fix yet, hence disabled).
- Revised fix for attribute options (using an empty set of options rather than null).
- Fix potential bugs in AttrInfo, make sure the given change number is newer whenever setting the last update or last delete time.

Thanks to Gilles for advice on these changes.