Updating sync to properly handle httpsredirect with ssltermination
Merged conflict