ec4a669
ticket 49551 - correctly handle subordinates and tombstone numsubordinates Additional fix for a case where an ADD is directly turned into a tombstone and teh tombstone is resurrected as conflict Reviewed by: Mark, thanks