Apply fix on all occurrence (ref. r1636697)

git-svn-id: https://svn.apache.org/repos/asf/jmeter/trunk@1636852 13f79535-47bb-0310-9956-ffa450edef68