Changes to support fix for #2844 in hammer-cli-foreman