BIP-135 refactor fixes
Merge branch 'BIP-139' of github.com:bipio-server/bip-pod into BIP-139