[packages_10.03.2] nginx: merge r28511, r29361