Remove dirty hack for quantum logging
do not start Nova-API if Neutron
Merge pull request #838 from Mirantis/havana_to_master_pick

Havana to master pick