Merge "Merged origin/release/1710 branch"
authorMichael Lando <ml636r@att.com>
Sun, 17 Sep 2017 15:44:40 +0000 (15:44 +0000)
committerGerrit Code Review <gerrit@onap.org>
Sun, 17 Sep 2017 15:44:40 +0000 (15:44 +0000)

Trivial merge