Moved #compact to a sesparate line to make it a little more obvious
Servers with a password locked root user have a nil @password.
Merge pull request #2497 from elight/optional_root_lock

[Rackspace | Compute] 1.8.7 fix plus better passwd -l handling