Merge "fix demo user has no password bug" into stable/colorado
authorJustin chi <chigang@huawei.com>
Mon, 28 Nov 2016 08:47:52 +0000 (08:47 +0000)
committerGerrit Code Review <gerrit@opnfv.org>
Mon, 28 Nov 2016 08:47:52 +0000 (08:47 +0000)

Trivial merge