Fix the proxier when a service with the same port is re-created after being deleted.

Also expand tests to cover this case, and one other related case.

Closes https://github.com/GoogleCloudPlatform/kubernetes/issues/925
I suppose so?  I'm not a huge table-driven test fan.  I'd rather just cut and paste.