Merge "Fix ironic-pxe startup issues"