Update to newer requests-mock

Solves a possible issue with newer version of requests, plus some other
small-ish bugs.

Includes new functionality like better request history checking and some
nicer syntax.

Change-Id: I643ec2e1f136205445c532bb04216d8a76129a51
Merge "Update to newer requests-mock"