Merge "re-point to upstream stable/queens"
authorZhijiang Hu <hu.zhijiang@zte.com.cn>
Thu, 5 Apr 2018 23:10:14 +0000 (23:10 +0000)
committerGerrit Code Review <gerrit@opnfv.org>
Thu, 5 Apr 2018 23:10:14 +0000 (23:10 +0000)

Trivial merge