Comment 24 for bug 1538330

Reviewed: https://review.opencontrail.org/20373
Committed: http://github.org/Juniper/contrail-controller/commit/ae28c109b0615a904883dcd0cb8365c087848843
Submitter: Zuul
Branch: R2.22.x

commit ae28c109b0615a904883dcd0cb8365c087848843
Author: Megh Bhatt <email address hidden>
Date: Tue Jan 26 14:55:44 2016 -0800

Option to disable flow collection in contrail-collector

Add disable_flow_collection flag to control flow message
collection in contrail-collector. Flow messages will be
dropped in the sandesh state machine in contrail-collector if
the flag is enabled.

Depends-On: Idc60f63849ba0f0a76302d477bbce9d69596a08b
Closes-Bug: #1538330
(cherry picked from commit 2b7d76042ae4119d97a1b40ae29a3da350756182)
(cherry picked from commit 15b64c643c169a3cf55ccf0b7d93ca3b4a1d4338)

Conflicts:
 src/analytics/options.cc
 src/analytics/options.h
 src/analytics/test/options_test.cc

Change-Id: I3c77c384adbc063902f084472c8299898c8e14c9
(cherry picked from commit 879b2070dc04eae2210c2acb53334a96423c0526)