Review and merge requests for HTTPCORE-618 and HTTPCORE-619

[Gary Gregory]

Hi Michael and all:

- https://issues.apache.org/jira/browse/HTTPCORE-618
- https://issues.apache.org/jira/browse/HTTPCORE-619

Gary