Merge branch 'andre/fix-aura-babe-equivocations' of github.com:paritytech/substrate into andre/fix-aura-babe-equivocations