Trying a different approach to handling VIPs for Fixed-IP mode. Misc pep8 fixes.

Change-Id: I1e7762c883db45b751d776750c2af340a4674189