Merge branch '2.4-release' into 2.4-testing
Merge branch '2.4-testing' into 2.4-dev
Fix an SSL related documentation typo.
1154790 - inject node strategy into the options.
Merge pull request #1446 from jortel/bz-1154790

1154790 - inject node strategy into the options.
Merge branch '2.4-release' into 2.4-testing
Merge branch '2.4-testing' into 2.4-dev
Merge branch '2.4-dev' into 2.5-testing
Merge branch '2.5-testing' into 2.5-dev
Merge branch '2.5-dev' into 2.6-dev
Merge branch '2.6-dev'