Merge pull request #183 from zenoss/bugfix/ZEN-12141

Bugfix/zen 12141
make ipv6_is_enabled() return false until we determine long term fix
Merge pull request #184 from zenoss/fix/ZEN-12088

Fix/zen 12088
Merge branch '5.0.0b1' into develop