Merge "Upgrade Apache SSH dependency to 0.6.0" into stable-2.6