NXP-14579: Fix assembly
Merge branch '5.8' of github.com:nuxeo/marketplace-elasticsearch into 5.8