Merge "Adding custom headers capability to REST client"