Cancel new builds. Update client logic.
Merge pull request #542 from marianitadn/bug-1171673

Merged by openshift-bot