Merge "Add convenience methods to IpPrefix and LinkAddress" into oc-mr1-dev