Clean up FIP properly on external net deletion

External network deletion errors out because FIP data is not
properly cleaned up.

Change-Id: Ic2acba1e7ac95ad36e97a1d452e747eefd6b911e
Fixes: MNP-4