Enyo 3638

This is a fix for [ENYO-3638] (https://enyojs.atlassian.net/browse/ENYO-3638).
(Ready to be merged).
Enyo-DCO-1.1-Signed-off-by: Francois Connetable <francois.connetable@hp.com>