Merge "Release 5.0.4"
authorXue Gao <xg353y@intl.att.com>
Mon, 20 Apr 2020 13:00:32 +0000 (13:00 +0000)
committerGerrit Code Review <gerrit@onap.org>
Mon, 20 Apr 2020 13:00:32 +0000 (13:00 +0000)

Trivial merge