Merge branch 'juerg/cachedfail' into 'master'

tests/integration/cachedfail.py: Fix test_push_cached_fail

See merge request BuildStream/buildstream!1167