Update doc as per recent changes and tests

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