Fix instances of 'const datum_string_t &x = y.as_str()' where y is a temporary value.
Merge branch 'tim_3062' into v1.15.x