Back-ports for 6.2.x

[Phil Sorber]

Hi all,

I've been working through the back-port requests for 6.2.x. If you happen
to see activity on your issue can you make sure I was able to complete the
back-port properly. I am only going off the commits marked in JIRA.

Thanks.