Merge "Cherry pick beijing improvements to master"
authorRich Bennett <rb2745@att.com>
Tue, 4 Sep 2018 14:04:47 +0000 (14:04 +0000)
committerGerrit Code Review <gerrit@onap.org>
Tue, 4 Sep 2018 14:04:47 +0000 (14:04 +0000)

Trivial merge