Comment 39 for bug 1202952

I am performing the same changes for the grizzly patch (and should be done shortly) to correct the same bugs in folsom.

Grizzly patch will not succeed gate because of In regards to bug 1212939, the quickest solution would be to include netaddr in the test-requirements with the grizzly patch, but it doesn't resolve the bug the "right" way.