Merge "tests: handle legacy and new bootstat complete"