Backport two recent PRs from polkadot-staging branch#2828

svyatonik merged 2 commits intomasterparitytech/parity-bridges-common:masterfrom

sv-backport-from-polkadot-stagingparitytech/parity-bridges-common:sv-backport-from-polkadot-stagingCopy head branch name to clipboard