Code merge from Jaffa_5_21_1 release
GOLD-32293 : Change log error message in transaction desktop has missing label tokens
Authored by: monicasinghal 2015-06-17
Parent: [r8275]
Child: [r8277]