Add patch to restore disabled sites

https://www.pivotaltracker.com/projects/585095#!/stories/41950351
Fix token for ps1.5 too
Merge branch 'ecommerce_platform' into generic-php-client