PLAT-6691 - Enable optional property placeholders

Fix case where optional is present
Simpler implementation using a null
Fix potential for interpolation to change wrong key