1.8.7 fix plus better passwd -l handling

Broke 1.8.7 test suite (parsing error) with my previous PR. This fixes that.

Also, new servers that have been passwd -l'd now return nil for their password.