Fix crash in PREPARE with property parameter when enable_containment is off#2339

jrgemignani merged 2 commits intoapache:masterapache/age:masterfrom

gregfelice:fix_1964_prepare_property_crashgregfelice/age:fix_1964_prepare_property_crashCopy head branch name to clipboard