ENYO-3082: feed review comments from ENYO-3082-2 into ENYO-3082

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