Merge pull request #8038 from unclejack/failed_build_context_cleanup

clean up the context when a build fails