Merge "modify the network and indentity password"
authorshuai chen <chenshuai@huawei.com>
Thu, 31 Dec 2015 10:41:37 +0000 (10:41 +0000)
committerGerrit Code Review <gerrit@172.30.200.206>
Thu, 31 Dec 2015 10:41:37 +0000 (10:41 +0000)

Trivial merge