Merge "Update for Aodh"
authorshuai chen <chenshuai@huawei.com>
Wed, 25 May 2016 00:45:41 +0000 (00:45 +0000)
committerGerrit Code Review <gerrit@172.30.200.206>
Wed, 25 May 2016 00:45:41 +0000 (00:45 +0000)

Trivial merge