Merge pull request #1153 from cshannon/AMQ-9435

AMQ-9435 - Ensure orderIndex next id is rolled back on duplicates