Fix case for disable_query_service flag
Merge pull request #259 from youtube/aaijazi_correct_casing_of_flag

Fix case for disable_query_service flag
Opt test/update_stream.py out of travis ci

test/update_stream.py is flaky and needs further investigation before
putting into travis ci.
Merge pull request #261 from yaoshengzhe/fix_update_stream_test

Opt test/update_stream.py out of travis ci
Merge branch 'master' into replication