Porting changes from n1k-grizzly to n1k-havana-dev for router scheduler
Merge branch 'n1k-havana-dev' of https://github.com/CiscoSystems/neutron into n1k-havana-dev