Sync plan locator fixes and increased the manifest upload timeout.

Uploading a manifest is too time consuming, hence the increase in
timeout.

Sync-plan related locators are now updated for the upstream builds.
Merge pull request #1743 from kbidarkar/locator-fixes

Sync plan locator fixes and increased the manifest upload timeout.