FAIMS-322: adding checks for archentity and relationship has having conflicts
merging master
FAIMS-322: fixing parent timestamps for multivalued attributes