Merge pull request #9774 from pwaller/cancellation

Add basic build cancellation