Combine two calls to setup_contrail.py
Merge remote-tracking branch 'dsetia/master' into contrail
dsetia patch for multinode