AA: rrdtool-1.0.x: merge r38944 (#14554)