Allow usage of -y *and* -A for treating the password
Allow usage of -y *and* -A for treating the password

Now this only works if the ',password' parameter is used with these
options, otherwise the latter will just override the former.

Need to document this neatly so it'll be understandable...

Also enable the use of SSH agent for the password when using a password
file -- YK was already supported.

levaidaniel/kc,levaidaniel/kc,levaidaniel/kc