Modified files to account for SOAP Headers.

Change-Id: If6f07cef378dd3b9514908783d1d12ebe1f6b2b2