Fixing localboot issue as per bug #950 Patch is coming from upstream commit (f775e740a3a817a4ff5ba26bea99dbfd735456b3)