Merge "Add cookies and improve headers in FauxRequest"