TRUNK-3293-new updated fix and added RelationshipValidator,unit tests