python-novaclient updates

Remove patches that are merged upstream and update others.
Remove nova-clear-rabbit-queues.
heat updates

Remove patches that are merged upstream and update others.