Make deletion of neutron resources for service VM more robust

Change-Id: Id7210ebb7961382255f1e7190b5b68a2afbb8119