(bug 56051) Use PropertyId objects in TermPropertyLabelResolver, ensure recache when needed

Change-Id: Ie3fa7d1948ccf1bd681789a9e0d1798ad251e7bd
Merge "(bug 56051) Use PropertyId objects in TermPropertyLabelResolver, ensure recache when needed"