Fix for Bug 2290.

Wrap existing IPv4 code with version test.
Add new IPv6 code with version test.

Change-Id: I30ed4c510dbc79f3e40cdafea4dd46cf37a20f39
Signed-off-by: Ryan Moats <rmoats@us.ibm.com>
Merge "Fix for Bug 2290."