Fix order of parameters for PropertyLabelNotResolvedException

Change-Id: Id60a046abeb12ff1ad2fefcf761d370e0cf662c0
(cherry picked from commit 76420ad66a0ab54a8f7edb3a0140ebfb42bcceb8)
(cherry picked from commit 80583162ff31fc4b1a2d2c1b0524958608071d32)
Merge "Fix order of parameters for PropertyLabelNotResolvedException"