Fix infinite retry logic
Removed references to OpenShift forums in several places
Merge pull request #544 from liggitt/fix_infinite_retry

Merged by openshift-bot
Merge pull request #536 from fabianofranz/dev/441

Merged by openshift-bot