Merge "Update emailbox"
authorSerena Feng <feng.xiaowei@zte.com.cn>
Wed, 15 Feb 2017 08:43:43 +0000 (08:43 +0000)
committerGerrit Code Review <gerrit@opnfv.org>
Wed, 15 Feb 2017 08:43:43 +0000 (08:43 +0000)

Trivial merge