Fix for update stream test.
Taking shard lock earlier in reparenting actions.
Merge pull request #9 from youtube/reparent-fix

Taking shard lock earlier in reparenting actions.
Merge pull request #10 from youtube/update-stream-fix

Fix for update stream test.
memcache as child of vttablet, phase 1.
rowcache as child, phase 2
rowcache as child, a few fixes
Fix tests
Merge branch 'rowcache-child' of github.com:youtube/vitess into rowcache-child

Conflicts:
	test/tablet.py