Merge "Add implied branch matchers on 'master'" into feature/zuulv3