Fix master property_map test by applying patch from develop.

It appears a past oversight prevented merging this change from
develop to master.  This patch fixes a "using typename outside
of template" error on Darwin which fixed the corresponding test.