Merge "Add upstream patches"
authorZhijiang Hu <hu.zhijiang@zte.com.cn>
Tue, 9 Jan 2018 01:30:54 +0000 (01:30 +0000)
committerGerrit Code Review <gerrit@opnfv.org>
Tue, 9 Jan 2018 01:30:54 +0000 (01:30 +0000)

Trivial merge