conflict resolve with upstream/openstack-foreman-installer-2.0.32

Signed-off-by: salmank <salmank@plumgrid.com>