Cherry pick Nova fix for Scheduler TypeError

This adds a cherry pick for a Nova fix that resolves
a TypeError in the Ironic and Nova Baremetal scheduler
host state classes:

https://review.openstack.org/#/c/121397/1

Also, removes the no-longer needed cherry pick for the
Nova Ironic extra_specs fix which has now landed.

Change-Id: I49a680b1373e16ce2887c97badfbaaa2f4232f69
Related-bug: #1369151