Merge "Use separate insert/delete statements to work around Blazegraph bug"