Fix for #4963 -- Use correct commands for password expiry on solaris

This fixes the command / option issues of #4963 as suggested on the ticket; the
setting-expiry when not needed aspects are deferred to #4975.