Workarounds for salt bug https://github.com/saltstack/salt/pull/12316

Signed-off-by: Dan Mick <dan.mick@inktank.com>