Updated discovery-ironic with fixes after Gerrit review

Imported patchset 1 of https://review.openstack.org/#/c/122151/