Improve compatibility with zcash incrementalmerkletree upstream crate#101

tzemanovic merged 2 commits intomainnamada-net/masp:mainfrom

tiago/update-incrementalmerkletreenamada-net/masp:tiago/update-incrementalmerkletreeCopy head branch name to clipboard