Postgres does not like empty strings for type inet

Check for empty string and explicitly set address to None

Fixes LP# 1112536

Change-Id: Ib6f1ca9ab4dd11a53e2ab8057664136166b4c616
Merge "Postgres does not like empty strings for type inet"
Merge remote-tracking branch 'citrix/master' into build-temp