Merged r9387 from trunk.
Merged r9390 from trunk.
Merged r9378 from trunk.
Merged r9381 from trunk.
Merged r9380 from trunk.
Merged r9379 from trunk.
Merged r9392 from trunk.
Removed deprecated accept_key_auth methods.