Merge "Add more checks when setting tenant."
authorRuan HE <ruan.he@orange.com>
Wed, 16 Sep 2015 14:53:19 +0000 (14:53 +0000)
committerGerrit Code Review <gerrit@172.30.200.206>
Wed, 16 Sep 2015 14:53:20 +0000 (14:53 +0000)

Trivial merge