Patch in:

commit cb9122cf6ea3c117f2e6df39da63629b3f6e7551
Author: Megh Bhatt <meghb@juniper.net>
Date:   Thu Nov 21 20:40:55 2013 -0800

    1. Add collector sandesh message and socket statistics on per
       generator basis
    2. Add collector error counters
    3. Send sandesh client socket statistics in UVE
    4. pep8 compliance for sandesh_req_impl.py
    5. Cleanup sandesh message statistics structure in sandesh_uve

commit bbf01f04c15deb549f4c76d34c6dabc6b3fb2f24
Author: Megh Bhatt <meghb@juniper.net>
Date:   Wed Nov 20 15:10:30 2013 -0800

    Generator Db connect timer and disconnect session can be called
    from concurrent threads and hence generator session can be NULL
    when Db connect init is called from the timer expiry. Fix is to
    add a disconnected flag which is set when disconnect session is
    called and not do Db connect init if generator is disconnected.
    Fixed couple of places in collector where generator disconnect
    session was not being called.