Cope with timeout1 happenign just after the first row is seen but not returned.
Sync between abort and timeout2 setting via private lock object.
Separate out the wrapper iterator because it's becoming more complicated.

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

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