save the original requestor's IP so it doesn't get overwritten

bug 1046837

Change-Id: I803fe9759b073fa1bc3d65240962a51f610db9d1
Merge "save the original requestor's IP so it doesn't get overwritten"