Merge "Reduce maximal size of karaf.log to fit in new VMs"