Merge branch 'master' into v5.0 65/7165/1 v5.0 v5.0.3 v5.0.4 v5.0.5
authorgarciadeblas <gerardo.garciadeblas@telefonica.com>
Fri, 1 Feb 2019 12:27:51 +0000 (13:27 +0100)
committergarciadeblas <gerardo.garciadeblas@telefonica.com>
Fri, 1 Feb 2019 12:27:51 +0000 (13:27 +0100)
Change-Id: Ia2bed9b76dc61640814773f7baef69bf9bb5cd49


Trivial merge