Fixed EZP-19161: Remove redundant indexes/keys
Merge pull request #539 from patrickallaert/EZP-19161

Fixed EZP-19161: Remove redundant indexes/keys