Add ip6 grain
Merge pull request #5831 from jcassee/develop

Add ip6 grain