[DS-1626] Duplicate dependency causes NoClassDefFoundError

This pull request is to fix DS-1626,