Merge "file 1 change for test"
authorgarciadeblas <gerardo.garciadeblas@telefonica.com>
Wed, 18 Apr 2018 14:18:25 +0000 (16:18 +0200)
committerGerrit Code Review <root@osm.etsi.org>
Wed, 18 Apr 2018 14:18:25 +0000 (16:18 +0200)

Trivial merge