Merge "Resync dublin branch" into dublin
authorRich Bennett <rb2745@att.com>
Wed, 22 May 2019 20:14:49 +0000 (20:14 +0000)
committerGerrit Code Review <gerrit@onap.org>
Wed, 22 May 2019 20:14:49 +0000 (20:14 +0000)

Trivial merge