Synced with Upstream

[fredijude]

The Upstream repository has the fix for a deadlock issue (https://github.com/shyiko/mysql-binlog-connector-java/issues/321). This impacts our project and hence we need this fix and hence so the others. I have resolved the merge conflicts with the upstream project after going over the difference in the changes.

I have retained the greeting packet authentication as of before and nothing has changed with the authentication as it was before. There were conflicts in the first place because of many minor method signature changes which were conflicting with the authentication-related code. Apart from that, all the commits which have been missed from the upstream repository have been resolved of every merge conflict.

[osheroff]

hey thanks for the PR.

so it looks like the fix for the keepalive race has been really caught up in quite a lot of refactoring. I'm not saying it's bad refactoring, it just makes this PR hard to review and sort of a big code churn that I'd prefer not to take unless I really had to.

At this point do you feel like you understand where the deadlock happens well enough that you and I could re-code a fix for it?

Alternatively, if you felt like you understood the commits in this PR well enough, if you opened a series of PRs where first the refactors happened and then the actual changes, that'd be ok too.