Replace some of the pending patches with the upstreamed versions and mark them accordingly. Signed-off-by: Robert Marko <robert.marko@sartura.hr>