Merge branch 'token-swap-pallet' of https://github.com/paritytech/parity-bridges-common into token-swap-pallet