Activation Key 404s

Cherry-pick a pair of commits on to the satellite-6.0.z.1 branch. These commits prevent many 404s related to activation keys. `ActivationKey.read_raw` method will only wait 5 seconds and attempt one more read if a 404 is received, so some 404s will still be received, but this should help.