Merge "Move rebooting HW node before the booting cfg node"