Adding a db merge end to end test.#1635

Merged

alainjobart merged 7 commits into

vitessio:masterfrom

alainjobart:merge

Apr 15, 2016

Commits on Apr 13, 2016

Adding a db merge end to end test.
alainjobart
committed

Commits on Apr 15, 2016

Fixing a couple comments.
alainjobart
committed