Fix for generating a template field if no property and "display-if-not-empty"

Change-Id: I3b9d2a175787f8eb2356f01135daeef99c897dd8