Added task reconciliation.
Further improved task reconciliaton.
Fixed bug in /v1/endpoints/
Merge from airbnb:staging