Merge "Switch to build-discarder property for logrotate"