Merge branch '7587-httplib2-retries-wip'
authorBrett Smith <brett@curoverse.com>
Fri, 23 Oct 2015 00:09:37 +0000 (20:09 -0400)
committerBrett Smith <brett@curoverse.com>
Fri, 23 Oct 2015 00:09:37 +0000 (20:09 -0400)
Refs #7587.  Closes #7640.


Trivial merge