Merge pull request #279 from rollandf/ocp-discon-ctnd #36

Job	Run time
build-and-deploy	1m 52s
deploy	6s
cleanup-stale-reviews / remove	5s
	2m 3s

Provide feedback