Fixed unit tests with FakeBuilderStatus
Merge branch 'staging' into cancelEntireBuildChain