Merge commit '893de23334d63c5de6d158d94430ad82e269dc2a' into foreman_proxy-dns_unmanage