Fix creating new endpoints during incompatible upgrades
Merge pull request #3436 from pmorie/dev/upgrades

Merged by openshift-bot