Wait for batcher pending futures a second time

I noticed this while looking into issue_299 (retry behavior).
renamed org.apache.http package to com.couchbase.org.apache.http
Merge remote-tracking branch 'upstream/master' into feature/issue_81
Merge branch 'feature/pegli_issue_81'