Make ipv4 netmask and ipv6 prefix seperate fields

Ticket: #3616