Format CIDR strings as per storage

Make sure the CIDR addresses are formatted in the same way sqlalchemy stores
them.

Fixes bug 1207355

Change-Id: I7b202c44e6e8e973c1753aa33c192a4fcfe762cc
Merge "Format CIDR strings as per storage"