Revert "Merge branch 'contrail/havana' of github.com:Juniper/nova into contrail/havana"

This reverts commit 859bdf552be3ba296513eb22109d02f1b6b83011, reversing
changes made to e463227014385683947693622b6a878778646e37.