Gas usage estimation failure on create/create2 meta-tx

It seems that web3 fails to estimate the gas for a meta-tx that is intended to deploy a contract from the identity.
The tests for this were failing until a custom gas was provided.
We could see that web3 was estimating a gas usage of about 230k and the actual gas costs were 380k.
See: https://github.com/trustlines-protocol/contracts/pull/373/commits/ab7d898bac6ae716a7106d4239c021dd6a3d32cf