I pushed my version of the patches that fix our ansible build as
`09e3cf583437ce421215dd28d2b94f574458b311'
and `acc6e6955f5d481cf984cafb0459d3489feda99e' to master.