commit 2 : updated the Workaround file
Merge branch 'trunk' of https://github.com/tor7/jmeter.git into trunk
Merge branch 'trunk' of https://github.com/tor7/jmeter.git into trunk

Conflicts:
	Workaround for  Bug #54784.md