Merge "Feature 5648: specification of IP addresses at CP level"
authorhoban <adrian.hoban@intel.com>
Tue, 12 Dec 2017 18:10:12 +0000 (19:10 +0100)
committerGerrit Code Review <root@osm.etsi.org>
Tue, 12 Dec 2017 18:10:12 +0000 (19:10 +0100)

Trivial merge