Porting changes from n1k-grizzly to n1k-havana-dev for router scheduler