Unify locking and sleeping mechanisms
Fix using lock/rate limit for requests.*
Fix a typo
Merge pull request #2022 from jmullan/feature/sleeps

Unify locking and sleeping mechanisms