Merge "Update for OOM integration"
authorRam Koya <rk541m@att.com>
Mon, 20 Aug 2018 18:08:27 +0000 (18:08 +0000)
committerGerrit Code Review <gerrit@onap.org>
Mon, 20 Aug 2018 18:08:27 +0000 (18:08 +0000)

Trivial merge