Merge "bootstat: test: duration fixes"