Merge "Trying to fix intermittently stuck unit tests" into release-1.1.0
authorMichael Lando <ml636r@att.com>
Sun, 29 Oct 2017 17:49:56 +0000 (17:49 +0000)
committerGerrit Code Review <gerrit@onap.org>
Sun, 29 Oct 2017 17:49:56 +0000 (17:49 +0000)

Trivial merge