Add retries in functional api
Merge pull request #4376 from pmorie/fix-tests

Merged by openshift-bot