[e2openplugins] apply changes from upstream.