(#15001) Return correct value for ipaddress6 for Fedora 17+
Merge branch 'pull-401' into 1.6.x

This closes GH-401
Merge branch '1.6.x' into 1.7.x