Use Octave_map instead of octave_scalar_map when building Octave data structures
p4#: 21615