Uplift of relevante changes of r1855479 in branches/2.4.x, re disappearance of h2_ngn_shed.* sources.