[neutron-sync-agent] Disregard local history, always rebase on origin.
Merge pull request #248 from eugeneia/neutron_sync_agent

[neutron-sync-agent] Disregard local history, always rebase on origin.