Merge branch 'release-notes' into 2.6-dev
Merge pull request #1349 from mhrivnak/release-notes-again

minor edit to release notes
Merge branch 'release-notes-again' into 2.6-dev
1162820 - Clarify SSL configuration settings.

https://bugzilla.redhat.com/show_bug.cgi?id=1162820
Merge branch '1162820' into 2.4-release
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.6-dev
Merge branch '2.6-dev'