Contracts upgrade gas estimate fix#7548

julien51 merged 3 commits intomasterunlock-protocol/unlock:masterfrom

contracts-upgrade-gas-estimate-fixunlock-protocol/unlock:contracts-upgrade-gas-estimate-fixCopy head branch name to clipboard