Add endpoint handling to upgrades
Merge pull request #3175 from pmorie/dev/upgrade_endpoints

Merged by openshift-bot