Fixes bug #1067959 Assure prefix length is included in CIDR definition. Change-Id: I32bb3dd1e5bffb409b3adee03015e21cce71caea