Merge "Rework the ironic-inspector auto-discovery test"