Merge "Omit service-type and service-role if empty"
authorRob Daugherty <rd472p@att.com>
Thu, 19 Oct 2017 01:15:21 +0000 (01:15 +0000)
committerGerrit Code Review <gerrit@onap.org>
Thu, 19 Oct 2017 01:15:21 +0000 (01:15 +0000)

Trivial merge