Merge change 20126

* changes:
  Removing SyncColumns from Contact - they were put there by accident.