Merge "FauxResponse: Honor cookie options, and other cleanup"
authorjenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Tue, 29 Sep 2015 23:09:50 +0000 (23:09 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Tue, 29 Sep 2015 23:09:50 +0000 (23:09 +0000)

Trivial merge