Resolve merge conflict, attempt 3

Docker-DCO-1.1-Signed-off-by: AJ Bowen <aj@gandi.net> (github: soulshake)
Merge pull request #6996 from soulshake/patch-1

Update https.md