Applying savi-2.1-b commits of our own group (Hadi, Eliot, Hesam, Thomas) to Havana release of nova.
Merge remote-tracking branch 'hesam/havana-with-savi-2.1-b' into merging-with-hesam
upgarding savi to havana, work in progress