Merge "Update code and build configuration"
authorEdan Binshtok <eb578m@intl.att.com>
Mon, 23 Oct 2017 10:46:06 +0000 (10:46 +0000)
committerGerrit Code Review <gerrit@onap.org>
Mon, 23 Oct 2017 10:46:06 +0000 (10:46 +0000)

Trivial merge