Move last changes from PR #32 to ironic-discoverd element