Merge branch 'zeke-refactor-1' of https://github.com/paritytech/substrate-api-sidecar into zeke-refactor-1