closes #7492
authorradhika <radhika@curoverse.com>
Wed, 28 Oct 2015 16:22:51 +0000 (12:22 -0400)
committerradhika <radhika@curoverse.com>
Wed, 28 Oct 2015 16:22:51 +0000 (12:22 -0400)
Merge branch '7492-keepproxy-upstream-errors'


Trivial merge