Merge branch 'feature5837' 12/8212/3
authorgarciadeblas <gerardo.garciadeblas@telefonica.com>
Fri, 22 Nov 2019 11:07:49 +0000 (12:07 +0100)
committergarciadeblas <gerardo.garciadeblas@telefonica.com>
Fri, 22 Nov 2019 11:07:49 +0000 (12:07 +0100)
Signed-off-by: garciadeblas <gerardo.garciadeblas@telefonica.com>
Change-Id: I31abc0d7de97c1dd3fb45fd7798fbab5d1bad5b4


Trivial merge