Make --shelve and --publish work correctly together.
Remove the p4-passwd option.
Moved last fix to the option parser.