Merge "add patch from upstream to fit bm deploy"
authorZhijiang Hu <hu.zhijiang@zte.com.cn>
Thu, 9 Mar 2017 06:39:06 +0000 (06:39 +0000)
committerGerrit Code Review <gerrit@opnfv.org>
Thu, 9 Mar 2017 06:39:06 +0000 (06:39 +0000)

Trivial merge