Merge "sgi575: Reenable PSCI NODE_HW_STATE test"