Merge "Another attempt to fix deploy problem"
authorRob Daugherty <rd472p@att.com>
Mon, 7 Aug 2017 12:44:39 +0000 (12:44 +0000)
committerGerrit Code Review <gerrit@onap.org>
Mon, 7 Aug 2017 12:44:39 +0000 (12:44 +0000)

Trivial merge