[WIP] Cancel new build

Depends on https://github.com/openshift/origin/pull/542 - so it has those commits also.