ENYO-2270, ENYO-2271: catch-up with core Enyo changes

Untested.

Enyo-DCO-1.1-Signed-off-by: Francois-Xavier KOWALSKI <francois-xavier.kowalski@hp.com>