Patch in:

commit a9e6a9a7c028f328d201b1e68a309e7258c0f3d2
Author: Megh Bhatt <meghb@juniper.net>
Date:   Fri Nov 22 01:11:33 2013 -0800

    1. Remove code that looks at column name to determine the data type
       stored in cassandra in query engine.
    2. Install contrail-nodemgr in the control, config, analytics,
       and vrouter venv from the respective rpms instead of from
       the supervisor rpm to support upgrade of individual
       rpms
Merge pull request #34 from Juniper/meghb_missedcommits

Patch in:
Merge remote-tracking branch 'github/master' into work