Merge "update user/passwd"
authorAric Gardner <agardner@linuxfoundation.org>
Wed, 24 Jan 2018 16:11:35 +0000 (16:11 +0000)
committerGerrit Code Review <gerrit@opnfv.org>
Wed, 24 Jan 2018 16:11:35 +0000 (16:11 +0000)

Trivial merge