See description in the linked JIRA.
I integrated this in jdg-6.2.x branch. Please update the status of this issue accordingly (bugzilla does not allow me to do it).