[packages_10.03.2] postgresql: merge r27856, r29199