Incorporate patch for PLUMgrid plugin in Havana