ssh-port command line option should take precedence over Chef::Config

If you have `--ssh-port` option and `knife[:ssh_port]` both specified, the command-line option loses. This commit reverses that.