Merge "Sync kolla patches"
authorZhijiang Hu <hu.zhijiang@zte.com.cn>
Fri, 26 Jan 2018 01:50:48 +0000 (01:50 +0000)
committerGerrit Code Review <gerrit@opnfv.org>
Fri, 26 Jan 2018 01:50:48 +0000 (01:50 +0000)

Trivial merge