Ensure passwd is a string if defined
Merge pull request #13297 from basepi/rosterarg13249

Ensure passwd is a string if defined in roster