Merge "update onap branch"
authorRuijing Guo <ruijing.guo@intel.com>
Thu, 11 Jan 2018 06:47:14 +0000 (06:47 +0000)
committerGerrit Code Review <gerrit@opnfv.org>
Thu, 11 Jan 2018 06:47:14 +0000 (06:47 +0000)

Trivial merge