ENYO-2501: re-align enyo on enyo/master for ares

Ready for merge

* According to GF-5044 for Ares, the *today* latest in enyo master.

Enyo-DCO-1.1-Signed-off-by: Marie-Antoinette de Bonis-Hamelin (Marian)
marie-antoinette.de-bonis-hamelin@hp.com