Restore bugs affecting 2.13 not nightly
Restore bugs affecting 2.13 not nightly

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

Former-commit-id: 581448b7733c5948592c2909c6517987ca6d3558
ham1/jmeter,etnetera/jmeter,apache/jmeter,apache/jmeter,ham1/jmeter,benbenw/jmeter,apache/jmeter,benbenw/jmeter,benbenw/jmeter,apache/jmeter,ham1/jmeter,ham1/jmeter,etnetera/jmeter,etnetera/jmeter,etnetera/jmeter,ham1/jmeter,etnetera/jmeter,apache/jmeter,benbenw/jmeter