Merge "bootstat: switch from root.root to system.log"