Respect property max redirects

RedirectionRetryHandler ignored PROPERTY_MAX_REDIRECTS on backoff and instead used PROPERTY_MAX_RETRIES.  In fixing this, I also cleaned up the code a bit.