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