Merge branch 'v2.0' tag 2.0.2 32/2032/1 feature1429
authortierno <alfonso.tiernosepulveda@telefonica.com>
Fri, 14 Jul 2017 11:25:24 +0000 (13:25 +0200)
committertierno <alfonso.tiernosepulveda@telefonica.com>
Fri, 14 Jul 2017 11:25:24 +0000 (13:25 +0200)
Change-Id: I9f418d8247af586a2de3d3cf736d26950d74ccf0
Signed-off-by: tierno <alfonso.tiernosepulveda@telefonica.com>

Trivial merge