merge commit
Merge branch 'master' of github.com:rvbelapure/openstack-nova-sched