Merge branch 'vnffg' 04/2304/1
authortierno <alfonso.tiernosepulveda@telefonica.com>
Wed, 27 Sep 2017 08:45:45 +0000 (10:45 +0200)
committertierno <alfonso.tiernosepulveda@telefonica.com>
Wed, 27 Sep 2017 08:49:55 +0000 (10:49 +0200)
Change-Id: I9d5b9beb6ded99c03816f6a3976f546b16ca6042


Trivial merge