Merge "bootstat: add recovery,quiescent and reboot,quiescent to known set"